96c1dc
@@ -9,7 +9,7 @@
public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
   /**
-   * Protobuf enum {@code org.apache.hadoop.hive.ql.io.orc.CompressionKind}
+   * Protobuf enum {@code orc.proto.CompressionKind}
    */
   public enum CompressionKind
       implements com.google.protobuf.ProtocolMessageEnum {
@@ -105,7 +105,7 @@
private CompressionKind(int index, int value) {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:org.apache.hadoop.hive.ql.io.orc.CompressionKind)
+    // @@protoc_insertion_point(enum_scope:orc.proto.CompressionKind)
   }
 
   public interface IntegerStatisticsOrBuilder
@@ -142,7 +142,7 @@
private CompressionKind(int index, int value) {
     long getSum();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.IntegerStatistics}
+   * Protobuf type {@code orc.proto.IntegerStatistics}
    */
   public static final class IntegerStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -221,12 +221,12 @@
private IntegerStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_IntegerStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_IntegerStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.Builder.class);
     }
@@ -421,19 +421,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.IntegerStatistics}
+     * Protobuf type {@code orc.proto.IntegerStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_IntegerStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_IntegerStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.Builder.class);
       }
@@ -473,7 +473,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_IntegerStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics getDefaultInstanceForType() {
@@ -655,7 +655,7 @@
public Builder clearSum() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.IntegerStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.IntegerStatistics)
     }
 
     static {
@@ -663,7 +663,7 @@
public Builder clearSum() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.IntegerStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.IntegerStatistics)
   }
 
   public interface DoubleStatisticsOrBuilder
@@ -700,7 +700,7 @@
public Builder clearSum() {
     double getSum();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.DoubleStatistics}
+   * Protobuf type {@code orc.proto.DoubleStatistics}
    */
   public static final class DoubleStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -779,12 +779,12 @@
private DoubleStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DoubleStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DoubleStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.Builder.class);
     }
@@ -979,19 +979,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.DoubleStatistics}
+     * Protobuf type {@code orc.proto.DoubleStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DoubleStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DoubleStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.Builder.class);
       }
@@ -1031,7 +1031,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DoubleStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics getDefaultInstanceForType() {
@@ -1213,7 +1213,7 @@
public Builder clearSum() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.DoubleStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.DoubleStatistics)
     }
 
     static {
@@ -1221,7 +1221,7 @@
public Builder clearSum() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.DoubleStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.DoubleStatistics)
   }
 
   public interface StringStatisticsOrBuilder
@@ -1276,7 +1276,7 @@
public Builder clearSum() {
     long getSum();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StringStatistics}
+   * Protobuf type {@code orc.proto.StringStatistics}
    */
   public static final class StringStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -1355,12 +1355,12 @@
private StringStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StringStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StringStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.Builder.class);
     }
@@ -1617,19 +1617,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StringStatistics}
+     * Protobuf type {@code orc.proto.StringStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StringStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StringStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.Builder.class);
       }
@@ -1669,7 +1669,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StringStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics getDefaultInstanceForType() {
@@ -1953,7 +1953,7 @@
public Builder clearSum() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.StringStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.StringStatistics)
     }
 
     static {
@@ -1961,7 +1961,7 @@
public Builder clearSum() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.StringStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.StringStatistics)
   }
 
   public interface BucketStatisticsOrBuilder
@@ -1982,7 +1982,7 @@
public Builder clearSum() {
     long getCount(int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BucketStatistics}
+   * Protobuf type {@code orc.proto.BucketStatistics}
    */
   public static final class BucketStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -2070,12 +2070,12 @@
private BucketStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BucketStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BucketStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.Builder.class);
     }
@@ -2243,19 +2243,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BucketStatistics}
+     * Protobuf type {@code orc.proto.BucketStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BucketStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BucketStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.Builder.class);
       }
@@ -2291,7 +2291,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BucketStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics getDefaultInstanceForType() {
@@ -2432,7 +2432,7 @@
public Builder clearCount() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.BucketStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.BucketStatistics)
     }
 
     static {
@@ -2440,7 +2440,7 @@
public Builder clearCount() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.BucketStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.BucketStatistics)
   }
 
   public interface DecimalStatisticsOrBuilder
@@ -2492,7 +2492,7 @@
public Builder clearCount() {
         getSumBytes();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.DecimalStatistics}
+   * Protobuf type {@code orc.proto.DecimalStatistics}
    */
   public static final class DecimalStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -2571,12 +2571,12 @@
private DecimalStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DecimalStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DecimalStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.Builder.class);
     }
@@ -2852,19 +2852,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.DecimalStatistics}
+     * Protobuf type {@code orc.proto.DecimalStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DecimalStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DecimalStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.Builder.class);
       }
@@ -2904,7 +2904,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DecimalStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics getDefaultInstanceForType() {
@@ -3215,7 +3215,7 @@
public Builder setSumBytes(
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.DecimalStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.DecimalStatistics)
     }
 
     static {
@@ -3223,7 +3223,7 @@
public Builder setSumBytes(
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.DecimalStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.DecimalStatistics)
   }
 
   public interface DateStatisticsOrBuilder
@@ -3258,7 +3258,7 @@
public Builder setSumBytes(
     int getMaximum();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.DateStatistics}
+   * Protobuf type {@code orc.proto.DateStatistics}
    */
   public static final class DateStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -3332,12 +3332,12 @@
private DateStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DateStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DateStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.Builder.class);
     }
@@ -3516,19 +3516,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.DateStatistics}
+     * Protobuf type {@code orc.proto.DateStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DateStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DateStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.Builder.class);
       }
@@ -3566,7 +3566,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_DateStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics getDefaultInstanceForType() {
@@ -3724,7 +3724,7 @@
public Builder clearMaximum() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.DateStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.DateStatistics)
     }
 
     static {
@@ -3732,7 +3732,7 @@
public Builder clearMaximum() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.DateStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.DateStatistics)
   }
 
   public interface TimestampStatisticsOrBuilder
@@ -3767,7 +3767,7 @@
public Builder clearMaximum() {
     long getMaximum();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.TimestampStatistics}
+   * Protobuf type {@code orc.proto.TimestampStatistics}
    */
   public static final class TimestampStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -3841,12 +3841,12 @@
private TimestampStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_TimestampStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_TimestampStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.Builder.class);
     }
@@ -4025,19 +4025,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.TimestampStatistics}
+     * Protobuf type {@code orc.proto.TimestampStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_TimestampStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_TimestampStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.Builder.class);
       }
@@ -4075,7 +4075,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_TimestampStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics getDefaultInstanceForType() {
@@ -4233,7 +4233,7 @@
public Builder clearMaximum() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.TimestampStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.TimestampStatistics)
     }
 
     static {
@@ -4241,7 +4241,7 @@
public Builder clearMaximum() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.TimestampStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.TimestampStatistics)
   }
 
   public interface BinaryStatisticsOrBuilder
@@ -4266,7 +4266,7 @@
public Builder clearMaximum() {
     long getSum();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BinaryStatistics}
+   * Protobuf type {@code orc.proto.BinaryStatistics}
    */
   public static final class BinaryStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -4335,12 +4335,12 @@
private BinaryStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BinaryStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BinaryStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.Builder.class);
     }
@@ -4495,19 +4495,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BinaryStatistics}
+     * Protobuf type {@code orc.proto.BinaryStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BinaryStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BinaryStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.Builder.class);
       }
@@ -4543,7 +4543,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BinaryStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics getDefaultInstanceForType() {
@@ -4661,7 +4661,7 @@
public Builder clearSum() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.BinaryStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.BinaryStatistics)
     }
 
     static {
@@ -4669,7 +4669,7 @@
public Builder clearSum() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.BinaryStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.BinaryStatistics)
   }
 
   public interface ColumnStatisticsOrBuilder
@@ -4685,115 +4685,115 @@
public Builder clearSum() {
      */
     long getNumberOfValues();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;
+    // optional .orc.proto.IntegerStatistics intStatistics = 2;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+     * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
      */
     boolean hasIntStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+     * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics getIntStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+     * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatisticsOrBuilder getIntStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;
+    // optional .orc.proto.DoubleStatistics doubleStatistics = 3;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+     * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
      */
     boolean hasDoubleStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+     * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics getDoubleStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+     * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatisticsOrBuilder getDoubleStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;
+    // optional .orc.proto.StringStatistics stringStatistics = 4;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+     * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
      */
     boolean hasStringStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+     * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics getStringStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+     * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatisticsOrBuilder getStringStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;
+    // optional .orc.proto.BucketStatistics bucketStatistics = 5;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+     * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
      */
     boolean hasBucketStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+     * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics getBucketStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+     * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatisticsOrBuilder getBucketStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;
+    // optional .orc.proto.DecimalStatistics decimalStatistics = 6;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+     * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
      */
     boolean hasDecimalStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+     * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics getDecimalStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+     * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatisticsOrBuilder getDecimalStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;
+    // optional .orc.proto.DateStatistics dateStatistics = 7;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+     * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
      */
     boolean hasDateStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+     * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics getDateStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+     * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatisticsOrBuilder getDateStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;
+    // optional .orc.proto.BinaryStatistics binaryStatistics = 8;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+     * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
      */
     boolean hasBinaryStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+     * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics getBinaryStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+     * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatisticsOrBuilder getBinaryStatisticsOrBuilder();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;
+    // optional .orc.proto.TimestampStatistics timestampStatistics = 9;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+     * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
      */
     boolean hasTimestampStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+     * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics getTimestampStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+     * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatisticsOrBuilder getTimestampStatisticsOrBuilder();
 
@@ -4808,7 +4808,7 @@
public Builder clearSum() {
     boolean getHasNull();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.ColumnStatistics}
+   * Protobuf type {@code orc.proto.ColumnStatistics}
    */
   public static final class ColumnStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -4986,12 +4986,12 @@
private ColumnStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder.class);
     }
@@ -5028,177 +5028,177 @@
public long getNumberOfValues() {
       return numberOfValues_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;
+    // optional .orc.proto.IntegerStatistics intStatistics = 2;
     public static final int INTSTATISTICS_FIELD_NUMBER = 2;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics intStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+     * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
      */
     public boolean hasIntStatistics() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+     * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics getIntStatistics() {
       return intStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+     * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatisticsOrBuilder getIntStatisticsOrBuilder() {
       return intStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;
+    // optional .orc.proto.DoubleStatistics doubleStatistics = 3;
     public static final int DOUBLESTATISTICS_FIELD_NUMBER = 3;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics doubleStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+     * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
      */
     public boolean hasDoubleStatistics() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+     * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics getDoubleStatistics() {
       return doubleStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+     * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatisticsOrBuilder getDoubleStatisticsOrBuilder() {
       return doubleStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;
+    // optional .orc.proto.StringStatistics stringStatistics = 4;
     public static final int STRINGSTATISTICS_FIELD_NUMBER = 4;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics stringStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+     * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
      */
     public boolean hasStringStatistics() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+     * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics getStringStatistics() {
       return stringStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+     * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatisticsOrBuilder getStringStatisticsOrBuilder() {
       return stringStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;
+    // optional .orc.proto.BucketStatistics bucketStatistics = 5;
     public static final int BUCKETSTATISTICS_FIELD_NUMBER = 5;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics bucketStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+     * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
      */
     public boolean hasBucketStatistics() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+     * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics getBucketStatistics() {
       return bucketStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+     * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatisticsOrBuilder getBucketStatisticsOrBuilder() {
       return bucketStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;
+    // optional .orc.proto.DecimalStatistics decimalStatistics = 6;
     public static final int DECIMALSTATISTICS_FIELD_NUMBER = 6;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics decimalStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+     * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
      */
     public boolean hasDecimalStatistics() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+     * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics getDecimalStatistics() {
       return decimalStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+     * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatisticsOrBuilder getDecimalStatisticsOrBuilder() {
       return decimalStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;
+    // optional .orc.proto.DateStatistics dateStatistics = 7;
     public static final int DATESTATISTICS_FIELD_NUMBER = 7;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics dateStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+     * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
      */
     public boolean hasDateStatistics() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+     * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics getDateStatistics() {
       return dateStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+     * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatisticsOrBuilder getDateStatisticsOrBuilder() {
       return dateStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;
+    // optional .orc.proto.BinaryStatistics binaryStatistics = 8;
     public static final int BINARYSTATISTICS_FIELD_NUMBER = 8;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics binaryStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+     * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
      */
     public boolean hasBinaryStatistics() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+     * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics getBinaryStatistics() {
       return binaryStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+     * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatisticsOrBuilder getBinaryStatisticsOrBuilder() {
       return binaryStatistics_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;
+    // optional .orc.proto.TimestampStatistics timestampStatistics = 9;
     public static final int TIMESTAMPSTATISTICS_FIELD_NUMBER = 9;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics timestampStatistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+     * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
      */
     public boolean hasTimestampStatistics() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+     * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics getTimestampStatistics() {
       return timestampStatistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+     * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatisticsOrBuilder getTimestampStatisticsOrBuilder() {
       return timestampStatistics_;
@@ -5402,19 +5402,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.ColumnStatistics}
+     * Protobuf type {@code orc.proto.ColumnStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder.class);
       }
@@ -5508,7 +5508,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getDefaultInstanceForType() {
@@ -5705,18 +5705,18 @@
public Builder clearNumberOfValues() {
         return this;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;
+      // optional .orc.proto.IntegerStatistics intStatistics = 2;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics intStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatisticsOrBuilder> intStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public boolean hasIntStatistics() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics getIntStatistics() {
         if (intStatisticsBuilder_ == null) {
@@ -5726,7 +5726,7 @@
public boolean hasIntStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public Builder setIntStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics value) {
         if (intStatisticsBuilder_ == null) {
@@ -5742,7 +5742,7 @@
public Builder setIntStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Intege
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public Builder setIntStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.Builder builderForValue) {
@@ -5756,7 +5756,7 @@
public Builder setIntStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public Builder mergeIntStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics value) {
         if (intStatisticsBuilder_ == null) {
@@ -5775,7 +5775,7 @@
public Builder mergeIntStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Inte
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public Builder clearIntStatistics() {
         if (intStatisticsBuilder_ == null) {
@@ -5788,7 +5788,7 @@
public Builder clearIntStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.Builder getIntStatisticsBuilder() {
         bitField0_ |= 0x00000002;
@@ -5796,7 +5796,7 @@
public Builder clearIntStatistics() {
         return getIntStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatisticsOrBuilder getIntStatisticsOrBuilder() {
         if (intStatisticsBuilder_ != null) {
@@ -5806,7 +5806,7 @@
public Builder clearIntStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.IntegerStatistics intStatistics = 2;</code>
+       * <code>optional .orc.proto.IntegerStatistics intStatistics = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.IntegerStatisticsOrBuilder> 
@@ -5822,18 +5822,18 @@
public Builder clearIntStatistics() {
         return intStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;
+      // optional .orc.proto.DoubleStatistics doubleStatistics = 3;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics doubleStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatisticsOrBuilder> doubleStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public boolean hasDoubleStatistics() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics getDoubleStatistics() {
         if (doubleStatisticsBuilder_ == null) {
@@ -5843,7 +5843,7 @@
public boolean hasDoubleStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public Builder setDoubleStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics value) {
         if (doubleStatisticsBuilder_ == null) {
@@ -5859,7 +5859,7 @@
public Builder setDoubleStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Dou
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public Builder setDoubleStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.Builder builderForValue) {
@@ -5873,7 +5873,7 @@
public Builder setDoubleStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public Builder mergeDoubleStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics value) {
         if (doubleStatisticsBuilder_ == null) {
@@ -5892,7 +5892,7 @@
public Builder mergeDoubleStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.D
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public Builder clearDoubleStatistics() {
         if (doubleStatisticsBuilder_ == null) {
@@ -5905,7 +5905,7 @@
public Builder clearDoubleStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.Builder getDoubleStatisticsBuilder() {
         bitField0_ |= 0x00000004;
@@ -5913,7 +5913,7 @@
public Builder clearDoubleStatistics() {
         return getDoubleStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatisticsOrBuilder getDoubleStatisticsOrBuilder() {
         if (doubleStatisticsBuilder_ != null) {
@@ -5923,7 +5923,7 @@
public Builder clearDoubleStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DoubleStatistics doubleStatistics = 3;</code>
+       * <code>optional .orc.proto.DoubleStatistics doubleStatistics = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.DoubleStatisticsOrBuilder> 
@@ -5939,18 +5939,18 @@
public Builder clearDoubleStatistics() {
         return doubleStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;
+      // optional .orc.proto.StringStatistics stringStatistics = 4;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics stringStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatisticsOrBuilder> stringStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public boolean hasStringStatistics() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics getStringStatistics() {
         if (stringStatisticsBuilder_ == null) {
@@ -5960,7 +5960,7 @@
public boolean hasStringStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public Builder setStringStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics value) {
         if (stringStatisticsBuilder_ == null) {
@@ -5976,7 +5976,7 @@
public Builder setStringStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Str
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public Builder setStringStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.Builder builderForValue) {
@@ -5990,7 +5990,7 @@
public Builder setStringStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public Builder mergeStringStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics value) {
         if (stringStatisticsBuilder_ == null) {
@@ -6009,7 +6009,7 @@
public Builder mergeStringStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.S
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public Builder clearStringStatistics() {
         if (stringStatisticsBuilder_ == null) {
@@ -6022,7 +6022,7 @@
public Builder clearStringStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.Builder getStringStatisticsBuilder() {
         bitField0_ |= 0x00000008;
@@ -6030,7 +6030,7 @@
public Builder clearStringStatistics() {
         return getStringStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatisticsOrBuilder getStringStatisticsOrBuilder() {
         if (stringStatisticsBuilder_ != null) {
@@ -6040,7 +6040,7 @@
public Builder clearStringStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.StringStatistics stringStatistics = 4;</code>
+       * <code>optional .orc.proto.StringStatistics stringStatistics = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.StringStatisticsOrBuilder> 
@@ -6056,18 +6056,18 @@
public Builder clearStringStatistics() {
         return stringStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;
+      // optional .orc.proto.BucketStatistics bucketStatistics = 5;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics bucketStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatisticsOrBuilder> bucketStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public boolean hasBucketStatistics() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics getBucketStatistics() {
         if (bucketStatisticsBuilder_ == null) {
@@ -6077,7 +6077,7 @@
public boolean hasBucketStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public Builder setBucketStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics value) {
         if (bucketStatisticsBuilder_ == null) {
@@ -6093,7 +6093,7 @@
public Builder setBucketStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Buc
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public Builder setBucketStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.Builder builderForValue) {
@@ -6107,7 +6107,7 @@
public Builder setBucketStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public Builder mergeBucketStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics value) {
         if (bucketStatisticsBuilder_ == null) {
@@ -6126,7 +6126,7 @@
public Builder mergeBucketStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.B
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public Builder clearBucketStatistics() {
         if (bucketStatisticsBuilder_ == null) {
@@ -6139,7 +6139,7 @@
public Builder clearBucketStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.Builder getBucketStatisticsBuilder() {
         bitField0_ |= 0x00000010;
@@ -6147,7 +6147,7 @@
public Builder clearBucketStatistics() {
         return getBucketStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatisticsOrBuilder getBucketStatisticsOrBuilder() {
         if (bucketStatisticsBuilder_ != null) {
@@ -6157,7 +6157,7 @@
public Builder clearBucketStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BucketStatistics bucketStatistics = 5;</code>
+       * <code>optional .orc.proto.BucketStatistics bucketStatistics = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.BucketStatisticsOrBuilder> 
@@ -6173,18 +6173,18 @@
public Builder clearBucketStatistics() {
         return bucketStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;
+      // optional .orc.proto.DecimalStatistics decimalStatistics = 6;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics decimalStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatisticsOrBuilder> decimalStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public boolean hasDecimalStatistics() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics getDecimalStatistics() {
         if (decimalStatisticsBuilder_ == null) {
@@ -6194,7 +6194,7 @@
public boolean hasDecimalStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public Builder setDecimalStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics value) {
         if (decimalStatisticsBuilder_ == null) {
@@ -6210,7 +6210,7 @@
public Builder setDecimalStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.De
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public Builder setDecimalStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.Builder builderForValue) {
@@ -6224,7 +6224,7 @@
public Builder setDecimalStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public Builder mergeDecimalStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics value) {
         if (decimalStatisticsBuilder_ == null) {
@@ -6243,7 +6243,7 @@
public Builder mergeDecimalStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public Builder clearDecimalStatistics() {
         if (decimalStatisticsBuilder_ == null) {
@@ -6256,7 +6256,7 @@
public Builder clearDecimalStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.Builder getDecimalStatisticsBuilder() {
         bitField0_ |= 0x00000020;
@@ -6264,7 +6264,7 @@
public Builder clearDecimalStatistics() {
         return getDecimalStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatisticsOrBuilder getDecimalStatisticsOrBuilder() {
         if (decimalStatisticsBuilder_ != null) {
@@ -6274,7 +6274,7 @@
public Builder clearDecimalStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DecimalStatistics decimalStatistics = 6;</code>
+       * <code>optional .orc.proto.DecimalStatistics decimalStatistics = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.DecimalStatisticsOrBuilder> 
@@ -6290,18 +6290,18 @@
public Builder clearDecimalStatistics() {
         return decimalStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;
+      // optional .orc.proto.DateStatistics dateStatistics = 7;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics dateStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatisticsOrBuilder> dateStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public boolean hasDateStatistics() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics getDateStatistics() {
         if (dateStatisticsBuilder_ == null) {
@@ -6311,7 +6311,7 @@
public boolean hasDateStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public Builder setDateStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics value) {
         if (dateStatisticsBuilder_ == null) {
@@ -6327,7 +6327,7 @@
public Builder setDateStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DateS
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public Builder setDateStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.Builder builderForValue) {
@@ -6341,7 +6341,7 @@
public Builder setDateStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public Builder mergeDateStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics value) {
         if (dateStatisticsBuilder_ == null) {
@@ -6360,7 +6360,7 @@
public Builder mergeDateStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Dat
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public Builder clearDateStatistics() {
         if (dateStatisticsBuilder_ == null) {
@@ -6373,7 +6373,7 @@
public Builder clearDateStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.Builder getDateStatisticsBuilder() {
         bitField0_ |= 0x00000040;
@@ -6381,7 +6381,7 @@
public Builder clearDateStatistics() {
         return getDateStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatisticsOrBuilder getDateStatisticsOrBuilder() {
         if (dateStatisticsBuilder_ != null) {
@@ -6391,7 +6391,7 @@
public Builder clearDateStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.DateStatistics dateStatistics = 7;</code>
+       * <code>optional .orc.proto.DateStatistics dateStatistics = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.DateStatisticsOrBuilder> 
@@ -6407,18 +6407,18 @@
public Builder clearDateStatistics() {
         return dateStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;
+      // optional .orc.proto.BinaryStatistics binaryStatistics = 8;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics binaryStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatisticsOrBuilder> binaryStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public boolean hasBinaryStatistics() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics getBinaryStatistics() {
         if (binaryStatisticsBuilder_ == null) {
@@ -6428,7 +6428,7 @@
public boolean hasBinaryStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public Builder setBinaryStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics value) {
         if (binaryStatisticsBuilder_ == null) {
@@ -6444,7 +6444,7 @@
public Builder setBinaryStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.Bin
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public Builder setBinaryStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.Builder builderForValue) {
@@ -6458,7 +6458,7 @@
public Builder setBinaryStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public Builder mergeBinaryStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics value) {
         if (binaryStatisticsBuilder_ == null) {
@@ -6477,7 +6477,7 @@
public Builder mergeBinaryStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.B
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public Builder clearBinaryStatistics() {
         if (binaryStatisticsBuilder_ == null) {
@@ -6490,7 +6490,7 @@
public Builder clearBinaryStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.Builder getBinaryStatisticsBuilder() {
         bitField0_ |= 0x00000080;
@@ -6498,7 +6498,7 @@
public Builder clearBinaryStatistics() {
         return getBinaryStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatisticsOrBuilder getBinaryStatisticsOrBuilder() {
         if (binaryStatisticsBuilder_ != null) {
@@ -6508,7 +6508,7 @@
public Builder clearBinaryStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.BinaryStatistics binaryStatistics = 8;</code>
+       * <code>optional .orc.proto.BinaryStatistics binaryStatistics = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.BinaryStatisticsOrBuilder> 
@@ -6524,18 +6524,18 @@
public Builder clearBinaryStatistics() {
         return binaryStatisticsBuilder_;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;
+      // optional .orc.proto.TimestampStatistics timestampStatistics = 9;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics timestampStatistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatisticsOrBuilder> timestampStatisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public boolean hasTimestampStatistics() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics getTimestampStatistics() {
         if (timestampStatisticsBuilder_ == null) {
@@ -6545,7 +6545,7 @@
public boolean hasTimestampStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public Builder setTimestampStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics value) {
         if (timestampStatisticsBuilder_ == null) {
@@ -6561,7 +6561,7 @@
public Builder setTimestampStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public Builder setTimestampStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.Builder builderForValue) {
@@ -6575,7 +6575,7 @@
public Builder setTimestampStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public Builder mergeTimestampStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics value) {
         if (timestampStatisticsBuilder_ == null) {
@@ -6594,7 +6594,7 @@
public Builder mergeTimestampStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProt
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public Builder clearTimestampStatistics() {
         if (timestampStatisticsBuilder_ == null) {
@@ -6607,7 +6607,7 @@
public Builder clearTimestampStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.Builder getTimestampStatisticsBuilder() {
         bitField0_ |= 0x00000100;
@@ -6615,7 +6615,7 @@
public Builder clearTimestampStatistics() {
         return getTimestampStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatisticsOrBuilder getTimestampStatisticsOrBuilder() {
         if (timestampStatisticsBuilder_ != null) {
@@ -6625,7 +6625,7 @@
public Builder clearTimestampStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.TimestampStatistics timestampStatistics = 9;</code>
+       * <code>optional .orc.proto.TimestampStatistics timestampStatistics = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.TimestampStatisticsOrBuilder> 
@@ -6674,7 +6674,7 @@
public Builder clearHasNull() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.ColumnStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.ColumnStatistics)
     }
 
     static {
@@ -6682,7 +6682,7 @@
public Builder clearHasNull() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.ColumnStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.ColumnStatistics)
   }
 
   public interface RowIndexEntryOrBuilder
@@ -6702,22 +6702,22 @@
public Builder clearHasNull() {
      */
     long getPositions(int index);
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;
+    // optional .orc.proto.ColumnStatistics statistics = 2;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+     * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
      */
     boolean hasStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+     * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getStatistics();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+     * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getStatisticsOrBuilder();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.RowIndexEntry}
+   * Protobuf type {@code orc.proto.RowIndexEntry}
    */
   public static final class RowIndexEntry extends
       com.google.protobuf.GeneratedMessage
@@ -6818,12 +6818,12 @@
private RowIndexEntry(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndexEntry_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndexEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder.class);
     }
@@ -6868,23 +6868,23 @@
public long getPositions(int index) {
     }
     private int positionsMemoizedSerializedSize = -1;
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;
+    // optional .orc.proto.ColumnStatistics statistics = 2;
     public static final int STATISTICS_FIELD_NUMBER = 2;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics statistics_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+     * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
      */
     public boolean hasStatistics() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+     * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getStatistics() {
       return statistics_;
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+     * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getStatisticsOrBuilder() {
       return statistics_;
@@ -7022,19 +7022,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.RowIndexEntry}
+     * Protobuf type {@code orc.proto.RowIndexEntry}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndexEntry_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndexEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder.class);
       }
@@ -7077,7 +7077,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndexEntry_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry getDefaultInstanceForType() {
@@ -7231,18 +7231,18 @@
public Builder clearPositions() {
         return this;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;
+      // optional .orc.proto.ColumnStatistics statistics = 2;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics statistics_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> statisticsBuilder_;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public boolean hasStatistics() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getStatistics() {
         if (statisticsBuilder_ == null) {
@@ -7252,7 +7252,7 @@
public boolean hasStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public Builder setStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
         if (statisticsBuilder_ == null) {
@@ -7268,7 +7268,7 @@
public Builder setStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnSta
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public Builder setStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -7282,7 +7282,7 @@
public Builder setStatistics(
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public Builder mergeStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
         if (statisticsBuilder_ == null) {
@@ -7301,7 +7301,7 @@
public Builder mergeStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnS
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public Builder clearStatistics() {
         if (statisticsBuilder_ == null) {
@@ -7314,7 +7314,7 @@
public Builder clearStatistics() {
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder getStatisticsBuilder() {
         bitField0_ |= 0x00000002;
@@ -7322,7 +7322,7 @@
public Builder clearStatistics() {
         return getStatisticsFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getStatisticsOrBuilder() {
         if (statisticsBuilder_ != null) {
@@ -7332,7 +7332,7 @@
public Builder clearStatistics() {
         }
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 2;</code>
+       * <code>optional .orc.proto.ColumnStatistics statistics = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
@@ -7348,7 +7348,7 @@
public Builder clearStatistics() {
         return statisticsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.RowIndexEntry)
+      // @@protoc_insertion_point(builder_scope:orc.proto.RowIndexEntry)
     }
 
     static {
@@ -7356,39 +7356,39 @@
public Builder clearStatistics() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.RowIndexEntry)
+    // @@protoc_insertion_point(class_scope:orc.proto.RowIndexEntry)
   }
 
   public interface RowIndexOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;
+    // repeated .orc.proto.RowIndexEntry entry = 1;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry> 
         getEntryList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry getEntry(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     int getEntryCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder> 
         getEntryOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder getEntryOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.RowIndex}
+   * Protobuf type {@code orc.proto.RowIndex}
    */
   public static final class RowIndex extends
       com.google.protobuf.GeneratedMessage
@@ -7463,12 +7463,12 @@
private RowIndex(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndex_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndex_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndex.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndex.Builder.class);
     }
@@ -7488,36 +7488,36 @@
public RowIndex parsePartialFrom(
       return PARSER;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;
+    // repeated .orc.proto.RowIndexEntry entry = 1;
     public static final int ENTRY_FIELD_NUMBER = 1;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry> entry_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry> getEntryList() {
       return entry_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder> 
         getEntryOrBuilderList() {
       return entry_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     public int getEntryCount() {
       return entry_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry getEntry(int index) {
       return entry_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+     * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder getEntryOrBuilder(
         int index) {
@@ -7634,19 +7634,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.RowIndex}
+     * Protobuf type {@code orc.proto.RowIndex}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndex_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndex_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndex.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndex.Builder.class);
       }
@@ -7687,7 +7687,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_RowIndex_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndex getDefaultInstanceForType() {
@@ -7782,7 +7782,7 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;
+      // repeated .orc.proto.RowIndexEntry entry = 1;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry> entry_ =
         java.util.Collections.emptyList();
       private void ensureEntryIsMutable() {
@@ -7796,7 +7796,7 @@
private void ensureEntryIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder> entryBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry> getEntryList() {
         if (entryBuilder_ == null) {
@@ -7806,7 +7806,7 @@
private void ensureEntryIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public int getEntryCount() {
         if (entryBuilder_ == null) {
@@ -7816,7 +7816,7 @@
public int getEntryCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry getEntry(int index) {
         if (entryBuilder_ == null) {
@@ -7826,7 +7826,7 @@
public int getEntryCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder setEntry(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry value) {
@@ -7843,7 +7843,7 @@
public Builder setEntry(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder setEntry(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder builderForValue) {
@@ -7857,7 +7857,7 @@
public Builder setEntry(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder addEntry(org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry value) {
         if (entryBuilder_ == null) {
@@ -7873,7 +7873,7 @@
public Builder addEntry(org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder addEntry(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry value) {
@@ -7890,7 +7890,7 @@
public Builder addEntry(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder addEntry(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder builderForValue) {
@@ -7904,7 +7904,7 @@
public Builder addEntry(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder addEntry(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder builderForValue) {
@@ -7918,7 +7918,7 @@
public Builder addEntry(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder addAllEntry(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry> values) {
@@ -7932,7 +7932,7 @@
public Builder addAllEntry(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder clearEntry() {
         if (entryBuilder_ == null) {
@@ -7945,7 +7945,7 @@
public Builder clearEntry() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public Builder removeEntry(int index) {
         if (entryBuilder_ == null) {
@@ -7958,14 +7958,14 @@
public Builder removeEntry(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder getEntryBuilder(
           int index) {
         return getEntryFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder getEntryOrBuilder(
           int index) {
@@ -7975,7 +7975,7 @@
public Builder removeEntry(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntryOrBuilder> 
            getEntryOrBuilderList() {
@@ -7986,14 +7986,14 @@
public Builder removeEntry(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder addEntryBuilder() {
         return getEntryFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder addEntryBuilder(
           int index) {
@@ -8001,7 +8001,7 @@
public Builder removeEntry(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.RowIndexEntry entry = 1;</code>
+       * <code>repeated .orc.proto.RowIndexEntry entry = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.RowIndexEntry.Builder> 
            getEntryBuilderList() {
@@ -8022,7 +8022,7 @@
public Builder removeEntry(int index) {
         return entryBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.RowIndex)
+      // @@protoc_insertion_point(builder_scope:orc.proto.RowIndex)
     }
 
     static {
@@ -8030,7 +8030,7 @@
public Builder removeEntry(int index) {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.RowIndex)
+    // @@protoc_insertion_point(class_scope:orc.proto.RowIndex)
   }
 
   public interface BloomFilterOrBuilder
@@ -8061,7 +8061,7 @@
public Builder removeEntry(int index) {
     long getBitset(int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BloomFilter}
+   * Protobuf type {@code orc.proto.BloomFilter}
    */
   public static final class BloomFilter extends
       com.google.protobuf.GeneratedMessage
@@ -8154,12 +8154,12 @@
private BloomFilter(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder.class);
     }
@@ -8339,19 +8339,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BloomFilter}
+     * Protobuf type {@code orc.proto.BloomFilter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder.class);
       }
@@ -8389,7 +8389,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilter_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter getDefaultInstanceForType() {
@@ -8572,7 +8572,7 @@
public Builder clearBitset() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.BloomFilter)
+      // @@protoc_insertion_point(builder_scope:orc.proto.BloomFilter)
     }
 
     static {
@@ -8580,39 +8580,39 @@
public Builder clearBitset() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.BloomFilter)
+    // @@protoc_insertion_point(class_scope:orc.proto.BloomFilter)
   }
 
   public interface BloomFilterIndexOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;
+    // repeated .orc.proto.BloomFilter bloomFilter = 1;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter> 
         getBloomFilterList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter getBloomFilter(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     int getBloomFilterCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder> 
         getBloomFilterOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder getBloomFilterOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BloomFilterIndex}
+   * Protobuf type {@code orc.proto.BloomFilterIndex}
    */
   public static final class BloomFilterIndex extends
       com.google.protobuf.GeneratedMessage
@@ -8687,12 +8687,12 @@
private BloomFilterIndex(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilterIndex_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilterIndex_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterIndex.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterIndex.Builder.class);
     }
@@ -8712,36 +8712,36 @@
public BloomFilterIndex parsePartialFrom(
       return PARSER;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;
+    // repeated .orc.proto.BloomFilter bloomFilter = 1;
     public static final int BLOOMFILTER_FIELD_NUMBER = 1;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter> bloomFilter_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter> getBloomFilterList() {
       return bloomFilter_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder> 
         getBloomFilterOrBuilderList() {
       return bloomFilter_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     public int getBloomFilterCount() {
       return bloomFilter_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter getBloomFilter(int index) {
       return bloomFilter_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+     * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder getBloomFilterOrBuilder(
         int index) {
@@ -8858,19 +8858,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.BloomFilterIndex}
+     * Protobuf type {@code orc.proto.BloomFilterIndex}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterIndexOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilterIndex_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilterIndex_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterIndex.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterIndex.Builder.class);
       }
@@ -8911,7 +8911,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_BloomFilterIndex_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterIndex getDefaultInstanceForType() {
@@ -9006,7 +9006,7 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;
+      // repeated .orc.proto.BloomFilter bloomFilter = 1;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter> bloomFilter_ =
         java.util.Collections.emptyList();
       private void ensureBloomFilterIsMutable() {
@@ -9020,7 +9020,7 @@
private void ensureBloomFilterIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder> bloomFilterBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter> getBloomFilterList() {
         if (bloomFilterBuilder_ == null) {
@@ -9030,7 +9030,7 @@
private void ensureBloomFilterIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public int getBloomFilterCount() {
         if (bloomFilterBuilder_ == null) {
@@ -9040,7 +9040,7 @@
public int getBloomFilterCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter getBloomFilter(int index) {
         if (bloomFilterBuilder_ == null) {
@@ -9050,7 +9050,7 @@
public int getBloomFilterCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder setBloomFilter(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter value) {
@@ -9067,7 +9067,7 @@
public Builder setBloomFilter(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder setBloomFilter(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder builderForValue) {
@@ -9081,7 +9081,7 @@
public Builder setBloomFilter(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder addBloomFilter(org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter value) {
         if (bloomFilterBuilder_ == null) {
@@ -9097,7 +9097,7 @@
public Builder addBloomFilter(org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFil
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder addBloomFilter(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter value) {
@@ -9114,7 +9114,7 @@
public Builder addBloomFilter(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder addBloomFilter(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder builderForValue) {
@@ -9128,7 +9128,7 @@
public Builder addBloomFilter(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder addBloomFilter(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder builderForValue) {
@@ -9142,7 +9142,7 @@
public Builder addBloomFilter(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder addAllBloomFilter(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter> values) {
@@ -9156,7 +9156,7 @@
public Builder addAllBloomFilter(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder clearBloomFilter() {
         if (bloomFilterBuilder_ == null) {
@@ -9169,7 +9169,7 @@
public Builder clearBloomFilter() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public Builder removeBloomFilter(int index) {
         if (bloomFilterBuilder_ == null) {
@@ -9182,14 +9182,14 @@
public Builder removeBloomFilter(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder getBloomFilterBuilder(
           int index) {
         return getBloomFilterFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder getBloomFilterOrBuilder(
           int index) {
@@ -9199,7 +9199,7 @@
public Builder removeBloomFilter(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilterOrBuilder> 
            getBloomFilterOrBuilderList() {
@@ -9210,14 +9210,14 @@
public Builder removeBloomFilter(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder addBloomFilterBuilder() {
         return getBloomFilterFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder addBloomFilterBuilder(
           int index) {
@@ -9225,7 +9225,7 @@
public Builder removeBloomFilter(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.BloomFilter bloomFilter = 1;</code>
+       * <code>repeated .orc.proto.BloomFilter bloomFilter = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.BloomFilter.Builder> 
            getBloomFilterBuilderList() {
@@ -9246,7 +9246,7 @@
public Builder removeBloomFilter(int index) {
         return bloomFilterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.BloomFilterIndex)
+      // @@protoc_insertion_point(builder_scope:orc.proto.BloomFilterIndex)
     }
 
     static {
@@ -9254,19 +9254,19 @@
public Builder removeBloomFilter(int index) {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.BloomFilterIndex)
+    // @@protoc_insertion_point(class_scope:orc.proto.BloomFilterIndex)
   }
 
   public interface StreamOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;
+    // optional .orc.proto.Stream.Kind kind = 1;
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
      */
     boolean hasKind();
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind getKind();
 
@@ -9291,7 +9291,7 @@
public Builder removeBloomFilter(int index) {
     long getLength();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Stream}
+   * Protobuf type {@code orc.proto.Stream}
    */
   public static final class Stream extends
       com.google.protobuf.GeneratedMessage
@@ -9376,12 +9376,12 @@
private Stream(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Stream_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Stream_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder.class);
     }
@@ -9402,7 +9402,7 @@
public Stream parsePartialFrom(
     }
 
     /**
-     * Protobuf enum {@code org.apache.hadoop.hive.ql.io.orc.Stream.Kind}
+     * Protobuf enum {@code orc.proto.Stream.Kind}
      *
      * <pre>
      * if you add new index stream kinds, you need to make sure to update
@@ -9539,21 +9539,21 @@
private Kind(int index, int value) {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.apache.hadoop.hive.ql.io.orc.Stream.Kind)
+      // @@protoc_insertion_point(enum_scope:orc.proto.Stream.Kind)
     }
 
     private int bitField0_;
-    // required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;
+    // optional .orc.proto.Stream.Kind kind = 1;
     public static final int KIND_FIELD_NUMBER = 1;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind kind_;
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind getKind() {
       return kind_;
@@ -9601,10 +9601,6 @@
public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      if (!hasKind()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -9721,19 +9717,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Stream}
+     * Protobuf type {@code orc.proto.Stream}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Stream_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Stream_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder.class);
       }
@@ -9773,7 +9769,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Stream_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream getDefaultInstanceForType() {
@@ -9834,10 +9830,6 @@
public Builder mergeFrom(org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream other)
       }
 
       public final boolean isInitialized() {
-        if (!hasKind()) {
-          
-          return false;
-        }
         return true;
       }
 
@@ -9860,22 +9852,22 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;
+      // optional .orc.proto.Stream.Kind kind = 1;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind kind_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind.PRESENT;
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind getKind() {
         return kind_;
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
        */
       public Builder setKind(org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind value) {
         if (value == null) {
@@ -9887,7 +9879,7 @@
public Builder setKind(org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Kind val
         return this;
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Stream.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Stream.Kind kind = 1;</code>
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -9962,7 +9954,7 @@
public Builder clearLength() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.Stream)
+      // @@protoc_insertion_point(builder_scope:orc.proto.Stream)
     }
 
     static {
@@ -9970,19 +9962,19 @@
public Builder clearLength() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.Stream)
+    // @@protoc_insertion_point(class_scope:orc.proto.Stream)
   }
 
   public interface ColumnEncodingOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;
+    // optional .orc.proto.ColumnEncoding.Kind kind = 1;
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+     * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
      */
     boolean hasKind();
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+     * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind getKind();
 
@@ -9997,7 +9989,7 @@
public Builder clearLength() {
     int getDictionarySize();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.ColumnEncoding}
+   * Protobuf type {@code orc.proto.ColumnEncoding}
    */
   public static final class ColumnEncoding extends
       com.google.protobuf.GeneratedMessage
@@ -10077,12 +10069,12 @@
private ColumnEncoding(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnEncoding_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnEncoding_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder.class);
     }
@@ -10103,7 +10095,7 @@
public ColumnEncoding parsePartialFrom(
     }
 
     /**
-     * Protobuf enum {@code org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind}
+     * Protobuf enum {@code orc.proto.ColumnEncoding.Kind}
      */
     public enum Kind
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -10199,21 +10191,21 @@
private Kind(int index, int value) {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind)
+      // @@protoc_insertion_point(enum_scope:orc.proto.ColumnEncoding.Kind)
     }
 
     private int bitField0_;
-    // required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;
+    // optional .orc.proto.ColumnEncoding.Kind kind = 1;
     public static final int KIND_FIELD_NUMBER = 1;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind kind_;
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+     * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+     * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind getKind() {
       return kind_;
@@ -10244,10 +10236,6 @@
public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      if (!hasKind()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -10357,19 +10345,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.ColumnEncoding}
+     * Protobuf type {@code orc.proto.ColumnEncoding}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnEncoding_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnEncoding_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder.class);
       }
@@ -10407,7 +10395,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_ColumnEncoding_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding getDefaultInstanceForType() {
@@ -10461,10 +10449,6 @@
public Builder mergeFrom(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodin
       }
 
       public final boolean isInitialized() {
-        if (!hasKind()) {
-          
-          return false;
-        }
         return true;
       }
 
@@ -10487,22 +10471,22 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;
+      // optional .orc.proto.ColumnEncoding.Kind kind = 1;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind kind_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind.DIRECT;
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+       * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+       * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind getKind() {
         return kind_;
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+       * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
        */
       public Builder setKind(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Kind value) {
         if (value == null) {
@@ -10514,7 +10498,7 @@
public Builder setKind(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.
         return this;
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding.Kind kind = 1;</code>
+       * <code>optional .orc.proto.ColumnEncoding.Kind kind = 1;</code>
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -10556,7 +10540,7 @@
public Builder clearDictionarySize() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.ColumnEncoding)
+      // @@protoc_insertion_point(builder_scope:orc.proto.ColumnEncoding)
     }
 
     static {
@@ -10564,64 +10548,64 @@
public Builder clearDictionarySize() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.ColumnEncoding)
+    // @@protoc_insertion_point(class_scope:orc.proto.ColumnEncoding)
   }
 
   public interface StripeFooterOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;
+    // repeated .orc.proto.Stream streams = 1;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream> 
         getStreamsList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream getStreams(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     int getStreamsCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder> 
         getStreamsOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder getStreamsOrBuilder(
         int index);
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;
+    // repeated .orc.proto.ColumnEncoding columns = 2;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding> 
         getColumnsList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding getColumns(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     int getColumnsCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder> 
         getColumnsOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder getColumnsOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StripeFooter}
+   * Protobuf type {@code orc.proto.StripeFooter}
    */
   public static final class StripeFooter extends
       com.google.protobuf.GeneratedMessage
@@ -10707,12 +10691,12 @@
private StripeFooter(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeFooter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeFooter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooter.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooter.Builder.class);
     }
@@ -10732,72 +10716,72 @@
public StripeFooter parsePartialFrom(
       return PARSER;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;
+    // repeated .orc.proto.Stream streams = 1;
     public static final int STREAMS_FIELD_NUMBER = 1;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream> streams_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream> getStreamsList() {
       return streams_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder> 
         getStreamsOrBuilderList() {
       return streams_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     public int getStreamsCount() {
       return streams_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream getStreams(int index) {
       return streams_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+     * <code>repeated .orc.proto.Stream streams = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder getStreamsOrBuilder(
         int index) {
       return streams_.get(index);
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;
+    // repeated .orc.proto.ColumnEncoding columns = 2;
     public static final int COLUMNS_FIELD_NUMBER = 2;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding> columns_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding> getColumnsList() {
       return columns_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder> 
         getColumnsOrBuilderList() {
       return columns_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     public int getColumnsCount() {
       return columns_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding getColumns(int index) {
       return columns_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+     * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder getColumnsOrBuilder(
         int index) {
@@ -10813,18 +10797,6 @@
public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      for (int i = 0; i < getStreamsCount(); i++) {
-        if (!getStreams(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getColumnsCount(); i++) {
-        if (!getColumns(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -10934,19 +10906,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StripeFooter}
+     * Protobuf type {@code orc.proto.StripeFooter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeFooter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeFooter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooter.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooter.Builder.class);
       }
@@ -10994,7 +10966,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeFooter_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooter getDefaultInstanceForType() {
@@ -11102,18 +11074,6 @@
public Builder mergeFrom(org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeFooter
       }
 
       public final boolean isInitialized() {
-        for (int i = 0; i < getStreamsCount(); i++) {
-          if (!getStreams(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getColumnsCount(); i++) {
-          if (!getColumns(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         return true;
       }
 
@@ -11136,7 +11096,7 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;
+      // repeated .orc.proto.Stream streams = 1;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream> streams_ =
         java.util.Collections.emptyList();
       private void ensureStreamsIsMutable() {
@@ -11150,7 +11110,7 @@
private void ensureStreamsIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder> streamsBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream> getStreamsList() {
         if (streamsBuilder_ == null) {
@@ -11160,7 +11120,7 @@
private void ensureStreamsIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public int getStreamsCount() {
         if (streamsBuilder_ == null) {
@@ -11170,7 +11130,7 @@
public int getStreamsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream getStreams(int index) {
         if (streamsBuilder_ == null) {
@@ -11180,7 +11140,7 @@
public int getStreamsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder setStreams(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream value) {
@@ -11197,7 +11157,7 @@
public Builder setStreams(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder setStreams(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder builderForValue) {
@@ -11211,7 +11171,7 @@
public Builder setStreams(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder addStreams(org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream value) {
         if (streamsBuilder_ == null) {
@@ -11227,7 +11187,7 @@
public Builder addStreams(org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream value
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder addStreams(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream value) {
@@ -11244,7 +11204,7 @@
public Builder addStreams(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder addStreams(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder builderForValue) {
@@ -11258,7 +11218,7 @@
public Builder addStreams(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder addStreams(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder builderForValue) {
@@ -11272,7 +11232,7 @@
public Builder addStreams(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder addAllStreams(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream> values) {
@@ -11286,7 +11246,7 @@
public Builder addAllStreams(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder clearStreams() {
         if (streamsBuilder_ == null) {
@@ -11299,7 +11259,7 @@
public Builder clearStreams() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public Builder removeStreams(int index) {
         if (streamsBuilder_ == null) {
@@ -11312,14 +11272,14 @@
public Builder removeStreams(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder getStreamsBuilder(
           int index) {
         return getStreamsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder getStreamsOrBuilder(
           int index) {
@@ -11329,7 +11289,7 @@
public Builder removeStreams(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StreamOrBuilder> 
            getStreamsOrBuilderList() {
@@ -11340,14 +11300,14 @@
public Builder removeStreams(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder addStreamsBuilder() {
         return getStreamsFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder addStreamsBuilder(
           int index) {
@@ -11355,7 +11315,7 @@
public Builder removeStreams(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Stream streams = 1;</code>
+       * <code>repeated .orc.proto.Stream streams = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Stream.Builder> 
            getStreamsBuilderList() {
@@ -11376,7 +11336,7 @@
public Builder removeStreams(int index) {
         return streamsBuilder_;
       }
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;
+      // repeated .orc.proto.ColumnEncoding columns = 2;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding> columns_ =
         java.util.Collections.emptyList();
       private void ensureColumnsIsMutable() {
@@ -11390,7 +11350,7 @@
private void ensureColumnsIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder> columnsBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding> getColumnsList() {
         if (columnsBuilder_ == null) {
@@ -11400,7 +11360,7 @@
private void ensureColumnsIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public int getColumnsCount() {
         if (columnsBuilder_ == null) {
@@ -11410,7 +11370,7 @@
public int getColumnsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding getColumns(int index) {
         if (columnsBuilder_ == null) {
@@ -11420,7 +11380,7 @@
public int getColumnsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder setColumns(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding value) {
@@ -11437,7 +11397,7 @@
public Builder setColumns(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder setColumns(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder builderForValue) {
@@ -11451,7 +11411,7 @@
public Builder setColumns(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder addColumns(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding value) {
         if (columnsBuilder_ == null) {
@@ -11467,7 +11427,7 @@
public Builder addColumns(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodi
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder addColumns(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding value) {
@@ -11484,7 +11444,7 @@
public Builder addColumns(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder addColumns(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder builderForValue) {
@@ -11498,7 +11458,7 @@
public Builder addColumns(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder addColumns(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder builderForValue) {
@@ -11512,7 +11472,7 @@
public Builder addColumns(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder addAllColumns(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding> values) {
@@ -11526,7 +11486,7 @@
public Builder addAllColumns(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder clearColumns() {
         if (columnsBuilder_ == null) {
@@ -11539,7 +11499,7 @@
public Builder clearColumns() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public Builder removeColumns(int index) {
         if (columnsBuilder_ == null) {
@@ -11552,14 +11512,14 @@
public Builder removeColumns(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder getColumnsBuilder(
           int index) {
         return getColumnsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder getColumnsOrBuilder(
           int index) {
@@ -11569,7 +11529,7 @@
public Builder removeColumns(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncodingOrBuilder> 
            getColumnsOrBuilderList() {
@@ -11580,14 +11540,14 @@
public Builder removeColumns(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder addColumnsBuilder() {
         return getColumnsFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder addColumnsBuilder(
           int index) {
@@ -11595,7 +11555,7 @@
public Builder removeColumns(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnEncoding columns = 2;</code>
+       * <code>repeated .orc.proto.ColumnEncoding columns = 2;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnEncoding.Builder> 
            getColumnsBuilderList() {
@@ -11616,7 +11576,7 @@
public Builder removeColumns(int index) {
         return columnsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.StripeFooter)
+      // @@protoc_insertion_point(builder_scope:orc.proto.StripeFooter)
     }
 
     static {
@@ -11624,19 +11584,19 @@
public Builder removeColumns(int index) {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.StripeFooter)
+    // @@protoc_insertion_point(class_scope:orc.proto.StripeFooter)
   }
 
   public interface TypeOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;
+    // optional .orc.proto.Type.Kind kind = 1;
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Type.Kind kind = 1;</code>
      */
     boolean hasKind();
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Type.Kind kind = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind getKind();
 
@@ -11705,7 +11665,7 @@
public Builder removeColumns(int index) {
     int getScale();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Type}
+   * Protobuf type {@code orc.proto.Type}
    */
   public static final class Type extends
       com.google.protobuf.GeneratedMessage
@@ -11830,12 +11790,12 @@
private Type(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Type_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Type_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Type_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Type_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder.class);
     }
@@ -11856,7 +11816,7 @@
public Type parsePartialFrom(
     }
 
     /**
-     * Protobuf enum {@code org.apache.hadoop.hive.ql.io.orc.Type.Kind}
+     * Protobuf enum {@code orc.proto.Type.Kind}
      */
     public enum Kind
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -12078,21 +12038,21 @@
private Kind(int index, int value) {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.apache.hadoop.hive.ql.io.orc.Type.Kind)
+      // @@protoc_insertion_point(enum_scope:orc.proto.Type.Kind)
     }
 
     private int bitField0_;
-    // required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;
+    // optional .orc.proto.Type.Kind kind = 1;
     public static final int KIND_FIELD_NUMBER = 1;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind kind_;
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Type.Kind kind = 1;</code>
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+     * <code>optional .orc.proto.Type.Kind kind = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind getKind() {
       return kind_;
@@ -12213,10 +12173,6 @@
public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      if (!hasKind()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -12373,19 +12329,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Type}
+     * Protobuf type {@code orc.proto.Type}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Type_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Type_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Type_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Type_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder.class);
       }
@@ -12431,7 +12387,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Type_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Type_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type getDefaultInstanceForType() {
@@ -12530,10 +12486,6 @@
public Builder mergeFrom(org.apache.hadoop.hive.ql.io.orc.OrcProto.Type other) {
       }
 
       public final boolean isInitialized() {
-        if (!hasKind()) {
-          
-          return false;
-        }
         return true;
       }
 
@@ -12556,22 +12508,22 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;
+      // optional .orc.proto.Type.Kind kind = 1;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind kind_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind.BOOLEAN;
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Type.Kind kind = 1;</code>
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Type.Kind kind = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind getKind() {
         return kind_;
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Type.Kind kind = 1;</code>
        */
       public Builder setKind(org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind value) {
         if (value == null) {
@@ -12583,7 +12535,7 @@
public Builder setKind(org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Kind value
         return this;
       }
       /**
-       * <code>required .org.apache.hadoop.hive.ql.io.orc.Type.Kind kind = 1;</code>
+       * <code>optional .orc.proto.Type.Kind kind = 1;</code>
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -12850,7 +12802,7 @@
public Builder clearScale() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.Type)
+      // @@protoc_insertion_point(builder_scope:orc.proto.Type)
     }
 
     static {
@@ -12858,7 +12810,7 @@
public Builder clearScale() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.Type)
+    // @@protoc_insertion_point(class_scope:orc.proto.Type)
   }
 
   public interface StripeInformationOrBuilder
@@ -12915,7 +12867,7 @@
public Builder clearScale() {
     long getNumberOfRows();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StripeInformation}
+   * Protobuf type {@code orc.proto.StripeInformation}
    */
   public static final class StripeInformation extends
       com.google.protobuf.GeneratedMessage
@@ -13004,12 +12956,12 @@
private StripeInformation(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeInformation_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeInformation_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder.class);
     }
@@ -13252,19 +13204,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StripeInformation}
+     * Protobuf type {@code orc.proto.StripeInformation}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeInformation_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeInformation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder.class);
       }
@@ -13308,7 +13260,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeInformation_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation getDefaultInstanceForType() {
@@ -13570,7 +13522,7 @@
public Builder clearNumberOfRows() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.StripeInformation)
+      // @@protoc_insertion_point(builder_scope:orc.proto.StripeInformation)
     }
 
     static {
@@ -13578,39 +13530,39 @@
public Builder clearNumberOfRows() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.StripeInformation)
+    // @@protoc_insertion_point(class_scope:orc.proto.StripeInformation)
   }
 
   public interface UserMetadataItemOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required string name = 1;
+    // optional string name = 1;
     /**
-     * <code>required string name = 1;</code>
+     * <code>optional string name = 1;</code>
      */
     boolean hasName();
     /**
-     * <code>required string name = 1;</code>
+     * <code>optional string name = 1;</code>
      */
     java.lang.String getName();
     /**
-     * <code>required string name = 1;</code>
+     * <code>optional string name = 1;</code>
      */
     com.google.protobuf.ByteString
         getNameBytes();
 
-    // required bytes value = 2;
+    // optional bytes value = 2;
     /**
-     * <code>required bytes value = 2;</code>
+     * <code>optional bytes value = 2;</code>
      */
     boolean hasValue();
     /**
-     * <code>required bytes value = 2;</code>
+     * <code>optional bytes value = 2;</code>
      */
     com.google.protobuf.ByteString getValue();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.UserMetadataItem}
+   * Protobuf type {@code orc.proto.UserMetadataItem}
    */
   public static final class UserMetadataItem extends
       com.google.protobuf.GeneratedMessage
@@ -13684,12 +13636,12 @@
private UserMetadataItem(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_UserMetadataItem_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_UserMetadataItem_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder.class);
     }
@@ -13710,17 +13662,17 @@
public UserMetadataItem parsePartialFrom(
     }
 
     private int bitField0_;
-    // required string name = 1;
+    // optional string name = 1;
     public static final int NAME_FIELD_NUMBER = 1;
     private java.lang.Object name_;
     /**
-     * <code>required string name = 1;</code>
+     * <code>optional string name = 1;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required string name = 1;</code>
+     * <code>optional string name = 1;</code>
      */
     public java.lang.String getName() {
       java.lang.Object ref = name_;
@@ -13737,7 +13689,7 @@
public boolean hasName() {
       }
     }
     /**
-     * <code>required string name = 1;</code>
+     * <code>optional string name = 1;</code>
      */
     public com.google.protobuf.ByteString
         getNameBytes() {
@@ -13753,17 +13705,17 @@
public boolean hasName() {
       }
     }
 
-    // required bytes value = 2;
+    // optional bytes value = 2;
     public static final int VALUE_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString value_;
     /**
-     * <code>required bytes value = 2;</code>
+     * <code>optional bytes value = 2;</code>
      */
     public boolean hasValue() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required bytes value = 2;</code>
+     * <code>optional bytes value = 2;</code>
      */
     public com.google.protobuf.ByteString getValue() {
       return value_;
@@ -13778,14 +13730,6 @@
public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      if (!hasName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasValue()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -13895,19 +13839,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.UserMetadataItem}
+     * Protobuf type {@code orc.proto.UserMetadataItem}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_UserMetadataItem_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_UserMetadataItem_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder.class);
       }
@@ -13945,7 +13889,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_UserMetadataItem_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem getDefaultInstanceForType() {
@@ -14001,14 +13945,6 @@
public Builder mergeFrom(org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataI
       }
 
       public final boolean isInitialized() {
-        if (!hasName()) {
-          
-          return false;
-        }
-        if (!hasValue()) {
-          
-          return false;
-        }
         return true;
       }
 
@@ -14031,16 +13967,16 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // required string name = 1;
+      // optional string name = 1;
       private java.lang.Object name_ = "";
       /**
-       * <code>required string name = 1;</code>
+       * <code>optional string name = 1;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required string name = 1;</code>
+       * <code>optional string name = 1;</code>
        */
       public java.lang.String getName() {
         java.lang.Object ref = name_;
@@ -14054,7 +13990,7 @@
public boolean hasName() {
         }
       }
       /**
-       * <code>required string name = 1;</code>
+       * <code>optional string name = 1;</code>
        */
       public com.google.protobuf.ByteString
           getNameBytes() {
@@ -14070,7 +14006,7 @@
public boolean hasName() {
         }
       }
       /**
-       * <code>required string name = 1;</code>
+       * <code>optional string name = 1;</code>
        */
       public Builder setName(
           java.lang.String value) {
@@ -14083,7 +14019,7 @@
public Builder setName(
         return this;
       }
       /**
-       * <code>required string name = 1;</code>
+       * <code>optional string name = 1;</code>
        */
       public Builder clearName() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -14092,7 +14028,7 @@
public Builder clearName() {
         return this;
       }
       /**
-       * <code>required string name = 1;</code>
+       * <code>optional string name = 1;</code>
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
@@ -14105,22 +14041,22 @@
public Builder setNameBytes(
         return this;
       }
 
-      // required bytes value = 2;
+      // optional bytes value = 2;
       private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes value = 2;</code>
+       * <code>optional bytes value = 2;</code>
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required bytes value = 2;</code>
+       * <code>optional bytes value = 2;</code>
        */
       public com.google.protobuf.ByteString getValue() {
         return value_;
       }
       /**
-       * <code>required bytes value = 2;</code>
+       * <code>optional bytes value = 2;</code>
        */
       public Builder setValue(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -14132,7 +14068,7 @@
public Builder setValue(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes value = 2;</code>
+       * <code>optional bytes value = 2;</code>
        */
       public Builder clearValue() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -14141,7 +14077,7 @@
public Builder clearValue() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.UserMetadataItem)
+      // @@protoc_insertion_point(builder_scope:orc.proto.UserMetadataItem)
     }
 
     static {
@@ -14149,39 +14085,39 @@
public Builder clearValue() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.UserMetadataItem)
+    // @@protoc_insertion_point(class_scope:orc.proto.UserMetadataItem)
   }
 
   public interface StripeStatisticsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;
+    // repeated .orc.proto.ColumnStatistics colStats = 1;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> 
         getColStatsList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getColStats(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     int getColStatsCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
         getColStatsOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getColStatsOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StripeStatistics}
+   * Protobuf type {@code orc.proto.StripeStatistics}
    */
   public static final class StripeStatistics extends
       com.google.protobuf.GeneratedMessage
@@ -14256,12 +14192,12 @@
private StripeStatistics(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeStatistics_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeStatistics_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder.class);
     }
@@ -14281,36 +14217,36 @@
public StripeStatistics parsePartialFrom(
       return PARSER;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;
+    // repeated .orc.proto.ColumnStatistics colStats = 1;
     public static final int COLSTATS_FIELD_NUMBER = 1;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> colStats_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> getColStatsList() {
       return colStats_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
         getColStatsOrBuilderList() {
       return colStats_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     public int getColStatsCount() {
       return colStats_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getColStats(int index) {
       return colStats_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+     * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getColStatsOrBuilder(
         int index) {
@@ -14427,19 +14363,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.StripeStatistics}
+     * Protobuf type {@code orc.proto.StripeStatistics}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeStatistics_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeStatistics_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder.class);
       }
@@ -14480,7 +14416,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_StripeStatistics_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics getDefaultInstanceForType() {
@@ -14575,7 +14511,7 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;
+      // repeated .orc.proto.ColumnStatistics colStats = 1;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> colStats_ =
         java.util.Collections.emptyList();
       private void ensureColStatsIsMutable() {
@@ -14589,7 +14525,7 @@
private void ensureColStatsIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> colStatsBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> getColStatsList() {
         if (colStatsBuilder_ == null) {
@@ -14599,7 +14535,7 @@
private void ensureColStatsIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public int getColStatsCount() {
         if (colStatsBuilder_ == null) {
@@ -14609,7 +14545,7 @@
public int getColStatsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getColStats(int index) {
         if (colStatsBuilder_ == null) {
@@ -14619,7 +14555,7 @@
public int getColStatsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder setColStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
@@ -14636,7 +14572,7 @@
public Builder setColStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder setColStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -14650,7 +14586,7 @@
public Builder setColStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder addColStats(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
         if (colStatsBuilder_ == null) {
@@ -14666,7 +14602,7 @@
public Builder addColStats(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStati
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder addColStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
@@ -14683,7 +14619,7 @@
public Builder addColStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder addColStats(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -14697,7 +14633,7 @@
public Builder addColStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder addColStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -14711,7 +14647,7 @@
public Builder addColStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder addAllColStats(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> values) {
@@ -14725,7 +14661,7 @@
public Builder addAllColStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder clearColStats() {
         if (colStatsBuilder_ == null) {
@@ -14738,7 +14674,7 @@
public Builder clearColStats() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public Builder removeColStats(int index) {
         if (colStatsBuilder_ == null) {
@@ -14751,14 +14687,14 @@
public Builder removeColStats(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder getColStatsBuilder(
           int index) {
         return getColStatsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getColStatsOrBuilder(
           int index) {
@@ -14768,7 +14704,7 @@
public Builder removeColStats(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
            getColStatsOrBuilderList() {
@@ -14779,14 +14715,14 @@
public Builder removeColStats(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder addColStatsBuilder() {
         return getColStatsFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder addColStatsBuilder(
           int index) {
@@ -14794,7 +14730,7 @@
public Builder removeColStats(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics colStats = 1;</code>
+       * <code>repeated .orc.proto.ColumnStatistics colStats = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder> 
            getColStatsBuilderList() {
@@ -14815,7 +14751,7 @@
public Builder removeColStats(int index) {
         return colStatsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.StripeStatistics)
+      // @@protoc_insertion_point(builder_scope:orc.proto.StripeStatistics)
     }
 
     static {
@@ -14823,39 +14759,39 @@
public Builder removeColStats(int index) {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.StripeStatistics)
+    // @@protoc_insertion_point(class_scope:orc.proto.StripeStatistics)
   }
 
   public interface MetadataOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;
+    // repeated .orc.proto.StripeStatistics stripeStats = 1;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics> 
         getStripeStatsList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics getStripeStats(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     int getStripeStatsCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder> 
         getStripeStatsOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder getStripeStatsOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Metadata}
+   * Protobuf type {@code orc.proto.Metadata}
    */
   public static final class Metadata extends
       com.google.protobuf.GeneratedMessage
@@ -14930,12 +14866,12 @@
private Metadata(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Metadata_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Metadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.Metadata.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Metadata.Builder.class);
     }
@@ -14955,36 +14891,36 @@
public Metadata parsePartialFrom(
       return PARSER;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;
+    // repeated .orc.proto.StripeStatistics stripeStats = 1;
     public static final int STRIPESTATS_FIELD_NUMBER = 1;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics> stripeStats_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics> getStripeStatsList() {
       return stripeStats_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder> 
         getStripeStatsOrBuilderList() {
       return stripeStats_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     public int getStripeStatsCount() {
       return stripeStats_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics getStripeStats(int index) {
       return stripeStats_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+     * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder getStripeStatsOrBuilder(
         int index) {
@@ -15101,19 +15037,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Metadata}
+     * Protobuf type {@code orc.proto.Metadata}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.MetadataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Metadata_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Metadata_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.Metadata.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Metadata.Builder.class);
       }
@@ -15154,7 +15090,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Metadata_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Metadata getDefaultInstanceForType() {
@@ -15249,7 +15185,7 @@
public Builder mergeFrom(
       }
       private int bitField0_;
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;
+      // repeated .orc.proto.StripeStatistics stripeStats = 1;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics> stripeStats_ =
         java.util.Collections.emptyList();
       private void ensureStripeStatsIsMutable() {
@@ -15263,7 +15199,7 @@
private void ensureStripeStatsIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder> stripeStatsBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics> getStripeStatsList() {
         if (stripeStatsBuilder_ == null) {
@@ -15273,7 +15209,7 @@
private void ensureStripeStatsIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public int getStripeStatsCount() {
         if (stripeStatsBuilder_ == null) {
@@ -15283,7 +15219,7 @@
public int getStripeStatsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics getStripeStats(int index) {
         if (stripeStatsBuilder_ == null) {
@@ -15293,7 +15229,7 @@
public int getStripeStatsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder setStripeStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics value) {
@@ -15310,7 +15246,7 @@
public Builder setStripeStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder setStripeStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder builderForValue) {
@@ -15324,7 +15260,7 @@
public Builder setStripeStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder addStripeStats(org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics value) {
         if (stripeStatsBuilder_ == null) {
@@ -15340,7 +15276,7 @@
public Builder addStripeStats(org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeSt
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder addStripeStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics value) {
@@ -15357,7 +15293,7 @@
public Builder addStripeStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder addStripeStats(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder builderForValue) {
@@ -15371,7 +15307,7 @@
public Builder addStripeStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder addStripeStats(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder builderForValue) {
@@ -15385,7 +15321,7 @@
public Builder addStripeStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder addAllStripeStats(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics> values) {
@@ -15399,7 +15335,7 @@
public Builder addAllStripeStats(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder clearStripeStats() {
         if (stripeStatsBuilder_ == null) {
@@ -15412,7 +15348,7 @@
public Builder clearStripeStats() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public Builder removeStripeStats(int index) {
         if (stripeStatsBuilder_ == null) {
@@ -15425,14 +15361,14 @@
public Builder removeStripeStats(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder getStripeStatsBuilder(
           int index) {
         return getStripeStatsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder getStripeStatsOrBuilder(
           int index) {
@@ -15442,7 +15378,7 @@
public Builder removeStripeStats(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatisticsOrBuilder> 
            getStripeStatsOrBuilderList() {
@@ -15453,14 +15389,14 @@
public Builder removeStripeStats(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder addStripeStatsBuilder() {
         return getStripeStatsFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder addStripeStatsBuilder(
           int index) {
@@ -15468,7 +15404,7 @@
public Builder removeStripeStats(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeStatistics stripeStats = 1;</code>
+       * <code>repeated .orc.proto.StripeStatistics stripeStats = 1;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeStatistics.Builder> 
            getStripeStatsBuilderList() {
@@ -15489,7 +15425,7 @@
public Builder removeStripeStats(int index) {
         return stripeStatsBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.Metadata)
+      // @@protoc_insertion_point(builder_scope:orc.proto.Metadata)
     }
 
     static {
@@ -15497,7 +15433,7 @@
public Builder removeStripeStats(int index) {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.Metadata)
+    // @@protoc_insertion_point(class_scope:orc.proto.Metadata)
   }
 
   public interface FooterOrBuilder
@@ -15523,77 +15459,77 @@
public Builder removeStripeStats(int index) {
      */
     long getContentLength();
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;
+    // repeated .orc.proto.StripeInformation stripes = 3;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation> 
         getStripesList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation getStripes(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     int getStripesCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder> 
         getStripesOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder getStripesOrBuilder(
         int index);
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;
+    // repeated .orc.proto.Type types = 4;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Type> 
         getTypesList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.Type getTypes(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     int getTypesCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder> 
         getTypesOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder getTypesOrBuilder(
         int index);
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;
+    // repeated .orc.proto.UserMetadataItem metadata = 5;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem> 
         getMetadataList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem getMetadata(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     int getMetadataCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder> 
         getMetadataOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder getMetadataOrBuilder(
         int index);
@@ -15608,27 +15544,27 @@
public Builder removeStripeStats(int index) {
      */
     long getNumberOfRows();
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;
+    // repeated .orc.proto.ColumnStatistics statistics = 7;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> 
         getStatisticsList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getStatistics(int index);
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     int getStatisticsCount();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
         getStatisticsOrBuilderList();
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getStatisticsOrBuilder(
         int index);
@@ -15644,7 +15580,7 @@
public Builder removeStripeStats(int index) {
     int getRowIndexStride();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Footer}
+   * Protobuf type {@code orc.proto.Footer}
    */
   public static final class Footer extends
       com.google.protobuf.GeneratedMessage
@@ -15772,12 +15708,12 @@
private Footer(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Footer_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Footer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.Footer.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Footer.Builder.class);
     }
@@ -15830,108 +15766,108 @@
public long getContentLength() {
       return contentLength_;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;
+    // repeated .orc.proto.StripeInformation stripes = 3;
     public static final int STRIPES_FIELD_NUMBER = 3;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation> stripes_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation> getStripesList() {
       return stripes_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder> 
         getStripesOrBuilderList() {
       return stripes_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     public int getStripesCount() {
       return stripes_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation getStripes(int index) {
       return stripes_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+     * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder getStripesOrBuilder(
         int index) {
       return stripes_.get(index);
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;
+    // repeated .orc.proto.Type types = 4;
     public static final int TYPES_FIELD_NUMBER = 4;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Type> types_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Type> getTypesList() {
       return types_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder> 
         getTypesOrBuilderList() {
       return types_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     public int getTypesCount() {
       return types_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type getTypes(int index) {
       return types_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+     * <code>repeated .orc.proto.Type types = 4;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder getTypesOrBuilder(
         int index) {
       return types_.get(index);
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;
+    // repeated .orc.proto.UserMetadataItem metadata = 5;
     public static final int METADATA_FIELD_NUMBER = 5;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem> metadata_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem> getMetadataList() {
       return metadata_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder> 
         getMetadataOrBuilderList() {
       return metadata_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     public int getMetadataCount() {
       return metadata_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem getMetadata(int index) {
       return metadata_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+     * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder getMetadataOrBuilder(
         int index) {
@@ -15954,36 +15890,36 @@
public long getNumberOfRows() {
       return numberOfRows_;
     }
 
-    // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;
+    // repeated .orc.proto.ColumnStatistics statistics = 7;
     public static final int STATISTICS_FIELD_NUMBER = 7;
     private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> statistics_;
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> getStatisticsList() {
       return statistics_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
         getStatisticsOrBuilderList() {
       return statistics_;
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     public int getStatisticsCount() {
       return statistics_.size();
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getStatistics(int index) {
       return statistics_.get(index);
     }
     /**
-     * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+     * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getStatisticsOrBuilder(
         int index) {
@@ -16021,18 +15957,6 @@
public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
 
-      for (int i = 0; i < getTypesCount(); i++) {
-        if (!getTypes(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getMetadataCount(); i++) {
-        if (!getMetadata(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -16184,19 +16108,19 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.Footer}
+     * Protobuf type {@code orc.proto.Footer}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.FooterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Footer_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Footer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.Footer.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.Footer.Builder.class);
       }
@@ -16266,7 +16190,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_Footer_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Footer getDefaultInstanceForType() {
@@ -16474,18 +16398,6 @@
public Builder mergeFrom(org.apache.hadoop.hive.ql.io.orc.OrcProto.Footer other)
       }
 
       public final boolean isInitialized() {
-        for (int i = 0; i < getTypesCount(); i++) {
-          if (!getTypes(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getMetadataCount(); i++) {
-          if (!getMetadata(i).isInitialized()) {
-            
-            return false;
-          }
-        }
         return true;
       }
 
@@ -16574,7 +16486,7 @@
public Builder clearContentLength() {
         return this;
       }
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;
+      // repeated .orc.proto.StripeInformation stripes = 3;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation> stripes_ =
         java.util.Collections.emptyList();
       private void ensureStripesIsMutable() {
@@ -16588,7 +16500,7 @@
private void ensureStripesIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder> stripesBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation> getStripesList() {
         if (stripesBuilder_ == null) {
@@ -16598,7 +16510,7 @@
private void ensureStripesIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public int getStripesCount() {
         if (stripesBuilder_ == null) {
@@ -16608,7 +16520,7 @@
public int getStripesCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation getStripes(int index) {
         if (stripesBuilder_ == null) {
@@ -16618,7 +16530,7 @@
public int getStripesCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder setStripes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation value) {
@@ -16635,7 +16547,7 @@
public Builder setStripes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder setStripes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder builderForValue) {
@@ -16649,7 +16561,7 @@
public Builder setStripes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder addStripes(org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation value) {
         if (stripesBuilder_ == null) {
@@ -16665,7 +16577,7 @@
public Builder addStripes(org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInform
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder addStripes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation value) {
@@ -16682,7 +16594,7 @@
public Builder addStripes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder addStripes(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder builderForValue) {
@@ -16696,7 +16608,7 @@
public Builder addStripes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder addStripes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder builderForValue) {
@@ -16710,7 +16622,7 @@
public Builder addStripes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder addAllStripes(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation> values) {
@@ -16724,7 +16636,7 @@
public Builder addAllStripes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder clearStripes() {
         if (stripesBuilder_ == null) {
@@ -16737,7 +16649,7 @@
public Builder clearStripes() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public Builder removeStripes(int index) {
         if (stripesBuilder_ == null) {
@@ -16750,14 +16662,14 @@
public Builder removeStripes(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder getStripesBuilder(
           int index) {
         return getStripesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder getStripesOrBuilder(
           int index) {
@@ -16767,7 +16679,7 @@
public Builder removeStripes(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformationOrBuilder> 
            getStripesOrBuilderList() {
@@ -16778,14 +16690,14 @@
public Builder removeStripes(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder addStripesBuilder() {
         return getStripesFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder addStripesBuilder(
           int index) {
@@ -16793,7 +16705,7 @@
public Builder removeStripes(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.StripeInformation stripes = 3;</code>
+       * <code>repeated .orc.proto.StripeInformation stripes = 3;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.StripeInformation.Builder> 
            getStripesBuilderList() {
@@ -16814,7 +16726,7 @@
public Builder removeStripes(int index) {
         return stripesBuilder_;
       }
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;
+      // repeated .orc.proto.Type types = 4;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Type> types_ =
         java.util.Collections.emptyList();
       private void ensureTypesIsMutable() {
@@ -16828,7 +16740,7 @@
private void ensureTypesIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.Type, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder> typesBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Type> getTypesList() {
         if (typesBuilder_ == null) {
@@ -16838,7 +16750,7 @@
private void ensureTypesIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public int getTypesCount() {
         if (typesBuilder_ == null) {
@@ -16848,7 +16760,7 @@
public int getTypesCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type getTypes(int index) {
         if (typesBuilder_ == null) {
@@ -16858,7 +16770,7 @@
public int getTypesCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder setTypes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type value) {
@@ -16875,7 +16787,7 @@
public Builder setTypes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder setTypes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder builderForValue) {
@@ -16889,7 +16801,7 @@
public Builder setTypes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder addTypes(org.apache.hadoop.hive.ql.io.orc.OrcProto.Type value) {
         if (typesBuilder_ == null) {
@@ -16905,7 +16817,7 @@
public Builder addTypes(org.apache.hadoop.hive.ql.io.orc.OrcProto.Type value) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder addTypes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type value) {
@@ -16922,7 +16834,7 @@
public Builder addTypes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder addTypes(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder builderForValue) {
@@ -16936,7 +16848,7 @@
public Builder addTypes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder addTypes(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder builderForValue) {
@@ -16950,7 +16862,7 @@
public Builder addTypes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder addAllTypes(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.Type> values) {
@@ -16964,7 +16876,7 @@
public Builder addAllTypes(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder clearTypes() {
         if (typesBuilder_ == null) {
@@ -16977,7 +16889,7 @@
public Builder clearTypes() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public Builder removeTypes(int index) {
         if (typesBuilder_ == null) {
@@ -16990,14 +16902,14 @@
public Builder removeTypes(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder getTypesBuilder(
           int index) {
         return getTypesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder getTypesOrBuilder(
           int index) {
@@ -17007,7 +16919,7 @@
public Builder removeTypes(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.TypeOrBuilder> 
            getTypesOrBuilderList() {
@@ -17018,14 +16930,14 @@
public Builder removeTypes(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder addTypesBuilder() {
         return getTypesFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder addTypesBuilder(
           int index) {
@@ -17033,7 +16945,7 @@
public Builder removeTypes(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.Type types = 4;</code>
+       * <code>repeated .orc.proto.Type types = 4;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.Type.Builder> 
            getTypesBuilderList() {
@@ -17054,7 +16966,7 @@
public Builder removeTypes(int index) {
         return typesBuilder_;
       }
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;
+      // repeated .orc.proto.UserMetadataItem metadata = 5;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem> metadata_ =
         java.util.Collections.emptyList();
       private void ensureMetadataIsMutable() {
@@ -17068,7 +16980,7 @@
private void ensureMetadataIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder> metadataBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem> getMetadataList() {
         if (metadataBuilder_ == null) {
@@ -17078,7 +16990,7 @@
private void ensureMetadataIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public int getMetadataCount() {
         if (metadataBuilder_ == null) {
@@ -17088,7 +17000,7 @@
public int getMetadataCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem getMetadata(int index) {
         if (metadataBuilder_ == null) {
@@ -17098,7 +17010,7 @@
public int getMetadataCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder setMetadata(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem value) {
@@ -17115,7 +17027,7 @@
public Builder setMetadata(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder setMetadata(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder builderForValue) {
@@ -17129,7 +17041,7 @@
public Builder setMetadata(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder addMetadata(org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem value) {
         if (metadataBuilder_ == null) {
@@ -17145,7 +17057,7 @@
public Builder addMetadata(org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadat
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder addMetadata(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem value) {
@@ -17162,7 +17074,7 @@
public Builder addMetadata(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder addMetadata(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder builderForValue) {
@@ -17176,7 +17088,7 @@
public Builder addMetadata(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder addMetadata(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder builderForValue) {
@@ -17190,7 +17102,7 @@
public Builder addMetadata(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder addAllMetadata(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem> values) {
@@ -17204,7 +17116,7 @@
public Builder addAllMetadata(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder clearMetadata() {
         if (metadataBuilder_ == null) {
@@ -17217,7 +17129,7 @@
public Builder clearMetadata() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public Builder removeMetadata(int index) {
         if (metadataBuilder_ == null) {
@@ -17230,14 +17142,14 @@
public Builder removeMetadata(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder getMetadataBuilder(
           int index) {
         return getMetadataFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder getMetadataOrBuilder(
           int index) {
@@ -17247,7 +17159,7 @@
public Builder removeMetadata(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItemOrBuilder> 
            getMetadataOrBuilderList() {
@@ -17258,14 +17170,14 @@
public Builder removeMetadata(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder addMetadataBuilder() {
         return getMetadataFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder addMetadataBuilder(
           int index) {
@@ -17273,7 +17185,7 @@
public Builder removeMetadata(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.UserMetadataItem metadata = 5;</code>
+       * <code>repeated .orc.proto.UserMetadataItem metadata = 5;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.UserMetadataItem.Builder> 
            getMetadataBuilderList() {
@@ -17327,7 +17239,7 @@
public Builder clearNumberOfRows() {
         return this;
       }
 
-      // repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;
+      // repeated .orc.proto.ColumnStatistics statistics = 7;
       private java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> statistics_ =
         java.util.Collections.emptyList();
       private void ensureStatisticsIsMutable() {
@@ -17341,7 +17253,7 @@
private void ensureStatisticsIsMutable() {
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> statisticsBuilder_;
 
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> getStatisticsList() {
         if (statisticsBuilder_ == null) {
@@ -17351,7 +17263,7 @@
private void ensureStatisticsIsMutable() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public int getStatisticsCount() {
         if (statisticsBuilder_ == null) {
@@ -17361,7 +17273,7 @@
public int getStatisticsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics getStatistics(int index) {
         if (statisticsBuilder_ == null) {
@@ -17371,7 +17283,7 @@
public int getStatisticsCount() {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder setStatistics(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
@@ -17388,7 +17300,7 @@
public Builder setStatistics(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder setStatistics(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -17402,7 +17314,7 @@
public Builder setStatistics(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder addStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
         if (statisticsBuilder_ == null) {
@@ -17418,7 +17330,7 @@
public Builder addStatistics(org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnSta
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder addStatistics(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics value) {
@@ -17435,7 +17347,7 @@
public Builder addStatistics(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder addStatistics(
           org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -17449,7 +17361,7 @@
public Builder addStatistics(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder addStatistics(
           int index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder builderForValue) {
@@ -17463,7 +17375,7 @@
public Builder addStatistics(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder addAllStatistics(
           java.lang.Iterable<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics> values) {
@@ -17477,7 +17389,7 @@
public Builder addAllStatistics(
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder clearStatistics() {
         if (statisticsBuilder_ == null) {
@@ -17490,7 +17402,7 @@
public Builder clearStatistics() {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public Builder removeStatistics(int index) {
         if (statisticsBuilder_ == null) {
@@ -17503,14 +17415,14 @@
public Builder removeStatistics(int index) {
         return this;
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder getStatisticsBuilder(
           int index) {
         return getStatisticsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder getStatisticsOrBuilder(
           int index) {
@@ -17520,7 +17432,7 @@
public Builder removeStatistics(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public java.util.List<? extends org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatisticsOrBuilder> 
            getStatisticsOrBuilderList() {
@@ -17531,14 +17443,14 @@
public Builder removeStatistics(int index) {
         }
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder addStatisticsBuilder() {
         return getStatisticsFieldBuilder().addBuilder(
             org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder addStatisticsBuilder(
           int index) {
@@ -17546,7 +17458,7 @@
public Builder removeStatistics(int index) {
             index, org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.apache.hadoop.hive.ql.io.orc.ColumnStatistics statistics = 7;</code>
+       * <code>repeated .orc.proto.ColumnStatistics statistics = 7;</code>
        */
       public java.util.List<org.apache.hadoop.hive.ql.io.orc.OrcProto.ColumnStatistics.Builder> 
            getStatisticsBuilderList() {
@@ -17600,7 +17512,7 @@
public Builder clearRowIndexStride() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.Footer)
+      // @@protoc_insertion_point(builder_scope:orc.proto.Footer)
     }
 
     static {
@@ -17608,7 +17520,7 @@
public Builder clearRowIndexStride() {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.Footer)
+    // @@protoc_insertion_point(class_scope:orc.proto.Footer)
   }
 
   public interface PostScriptOrBuilder
@@ -17624,13 +17536,13 @@
public Builder clearRowIndexStride() {
      */
     long getFooterLength();
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;
+    // optional .orc.proto.CompressionKind compression = 2;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+     * <code>optional .orc.proto.CompressionKind compression = 2;</code>
      */
     boolean hasCompression();
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+     * <code>optional .orc.proto.CompressionKind compression = 2;</code>
      */
     org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind getCompression();
 
@@ -17736,7 +17648,7 @@
public Builder clearRowIndexStride() {
         getMagicBytes();
   }
   /**
-   * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.PostScript}
+   * Protobuf type {@code orc.proto.PostScript}
    *
    * <pre>
    * Serialized length must be less that 255 bytes
@@ -17864,12 +17776,12 @@
private PostScript(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_descriptor;
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_PostScript_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_fieldAccessorTable
+      return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_PostScript_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.hadoop.hive.ql.io.orc.OrcProto.PostScript.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.PostScript.Builder.class);
     }
@@ -17906,17 +17818,17 @@
public long getFooterLength() {
       return footerLength_;
     }
 
-    // optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;
+    // optional .orc.proto.CompressionKind compression = 2;
     public static final int COMPRESSION_FIELD_NUMBER = 2;
     private org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind compression_;
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+     * <code>optional .orc.proto.CompressionKind compression = 2;</code>
      */
     public boolean hasCompression() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+     * <code>optional .orc.proto.CompressionKind compression = 2;</code>
      */
     public org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind getCompression() {
       return compression_;
@@ -18251,7 +18163,7 @@
protected Builder newBuilderForType(
       return builder;
     }
     /**
-     * Protobuf type {@code org.apache.hadoop.hive.ql.io.orc.PostScript}
+     * Protobuf type {@code orc.proto.PostScript}
      *
      * <pre>
      * Serialized length must be less that 255 bytes
@@ -18262,12 +18174,12 @@
protected Builder newBuilderForType(
        implements org.apache.hadoop.hive.ql.io.orc.OrcProto.PostScriptOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_PostScript_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_fieldAccessorTable
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_PostScript_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.hadoop.hive.ql.io.orc.OrcProto.PostScript.class, org.apache.hadoop.hive.ql.io.orc.OrcProto.PostScript.Builder.class);
       }
@@ -18315,7 +18227,7 @@
public Builder clone() {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_descriptor;
+        return org.apache.hadoop.hive.ql.io.orc.OrcProto.internal_static_orc_proto_PostScript_descriptor;
       }
 
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.PostScript getDefaultInstanceForType() {
@@ -18469,22 +18381,22 @@
public Builder clearFooterLength() {
         return this;
       }
 
-      // optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;
+      // optional .orc.proto.CompressionKind compression = 2;
       private org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind compression_ = org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind.NONE;
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+       * <code>optional .orc.proto.CompressionKind compression = 2;</code>
        */
       public boolean hasCompression() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+       * <code>optional .orc.proto.CompressionKind compression = 2;</code>
        */
       public org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind getCompression() {
         return compression_;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+       * <code>optional .orc.proto.CompressionKind compression = 2;</code>
        */
       public Builder setCompression(org.apache.hadoop.hive.ql.io.orc.OrcProto.CompressionKind value) {
         if (value == null) {
@@ -18496,7 +18408,7 @@
public Builder setCompression(org.apache.hadoop.hive.ql.io.orc.OrcProto.Compress
         return this;
       }
       /**
-       * <code>optional .org.apache.hadoop.hive.ql.io.orc.CompressionKind compression = 2;</code>
+       * <code>optional .orc.proto.CompressionKind compression = 2;</code>
        */
       public Builder clearCompression() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -18834,7 +18746,7 @@
public Builder setMagicBytes(
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.apache.hadoop.hive.ql.io.orc.PostScript)
+      // @@protoc_insertion_point(builder_scope:orc.proto.PostScript)
     }
 
     static {
@@ -18842,124 +18754,124 @@
public Builder setMagicBytes(
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.apache.hadoop.hive.ql.io.orc.PostScript)
+    // @@protoc_insertion_point(class_scope:orc.proto.PostScript)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_descriptor;
+    internal_static_orc_proto_IntegerStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_fieldAccessorTable;
+      internal_static_orc_proto_IntegerStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_descriptor;
+    internal_static_orc_proto_DoubleStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_fieldAccessorTable;
+      internal_static_orc_proto_DoubleStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_descriptor;
+    internal_static_orc_proto_StringStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_fieldAccessorTable;
+      internal_static_orc_proto_StringStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_descriptor;
+    internal_static_orc_proto_BucketStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_fieldAccessorTable;
+      internal_static_orc_proto_BucketStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_descriptor;
+    internal_static_orc_proto_DecimalStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_fieldAccessorTable;
+      internal_static_orc_proto_DecimalStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_descriptor;
+    internal_static_orc_proto_DateStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_fieldAccessorTable;
+      internal_static_orc_proto_DateStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_descriptor;
+    internal_static_orc_proto_TimestampStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_fieldAccessorTable;
+      internal_static_orc_proto_TimestampStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_descriptor;
+    internal_static_orc_proto_BinaryStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_fieldAccessorTable;
+      internal_static_orc_proto_BinaryStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_descriptor;
+    internal_static_orc_proto_ColumnStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_fieldAccessorTable;
+      internal_static_orc_proto_ColumnStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_descriptor;
+    internal_static_orc_proto_RowIndexEntry_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_fieldAccessorTable;
+      internal_static_orc_proto_RowIndexEntry_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_descriptor;
+    internal_static_orc_proto_RowIndex_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_fieldAccessorTable;
+      internal_static_orc_proto_RowIndex_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_descriptor;
+    internal_static_orc_proto_BloomFilter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_fieldAccessorTable;
+      internal_static_orc_proto_BloomFilter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_descriptor;
+    internal_static_orc_proto_BloomFilterIndex_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_fieldAccessorTable;
+      internal_static_orc_proto_BloomFilterIndex_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_descriptor;
+    internal_static_orc_proto_Stream_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_fieldAccessorTable;
+      internal_static_orc_proto_Stream_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_descriptor;
+    internal_static_orc_proto_ColumnEncoding_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_fieldAccessorTable;
+      internal_static_orc_proto_ColumnEncoding_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_descriptor;
+    internal_static_orc_proto_StripeFooter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_fieldAccessorTable;
+      internal_static_orc_proto_StripeFooter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_Type_descriptor;
+    internal_static_orc_proto_Type_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_Type_fieldAccessorTable;
+      internal_static_orc_proto_Type_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_descriptor;
+    internal_static_orc_proto_StripeInformation_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_fieldAccessorTable;
+      internal_static_orc_proto_StripeInformation_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_descriptor;
+    internal_static_orc_proto_UserMetadataItem_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_fieldAccessorTable;
+      internal_static_orc_proto_UserMetadataItem_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_descriptor;
+    internal_static_orc_proto_StripeStatistics_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_fieldAccessorTable;
+      internal_static_orc_proto_StripeStatistics_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_descriptor;
+    internal_static_orc_proto_Metadata_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_fieldAccessorTable;
+      internal_static_orc_proto_Metadata_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_descriptor;
+    internal_static_orc_proto_Footer_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_fieldAccessorTable;
+      internal_static_orc_proto_Footer_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_descriptor;
+    internal_static_orc_proto_PostScript_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_fieldAccessorTable;
+      internal_static_orc_proto_PostScript_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -18969,236 +18881,223 @@
public Builder setMagicBytes(
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017orc_proto.proto\022 org.apache.hadoop.hiv" +
-      "e.ql.io.orc\"B\n\021IntegerStatistics\022\017\n\007mini" +
-      "mum\030\001 \001(\022\022\017\n\007maximum\030\002 \001(\022\022\013\n\003sum\030\003 \001(\022\"" +
-      "A\n\020DoubleStatistics\022\017\n\007minimum\030\001 \001(\001\022\017\n\007" +
-      "maximum\030\002 \001(\001\022\013\n\003sum\030\003 \001(\001\"A\n\020StringStat" +
-      "istics\022\017\n\007minimum\030\001 \001(\t\022\017\n\007maximum\030\002 \001(\t" +
-      "\022\013\n\003sum\030\003 \001(\022\"%\n\020BucketStatistics\022\021\n\005cou" +
-      "nt\030\001 \003(\004B\002\020\001\"B\n\021DecimalStatistics\022\017\n\007min" +
-      "imum\030\001 \001(\t\022\017\n\007maximum\030\002 \001(\t\022\013\n\003sum\030\003 \001(\t" +
-      "\"2\n\016DateStatistics\022\017\n\007minimum\030\001 \001(\021\022\017\n\007m",
-      "aximum\030\002 \001(\021\"7\n\023TimestampStatistics\022\017\n\007m" +
-      "inimum\030\001 \001(\022\022\017\n\007maximum\030\002 \001(\022\"\037\n\020BinaryS" +
-      "tatistics\022\013\n\003sum\030\001 \001(\022\"\255\005\n\020ColumnStatist" +
-      "ics\022\026\n\016numberOfValues\030\001 \001(\004\022J\n\rintStatis" +
-      "tics\030\002 \001(\01323.org.apache.hadoop.hive.ql.i" +
-      "o.orc.IntegerStatistics\022L\n\020doubleStatist" +
-      "ics\030\003 \001(\01322.org.apache.hadoop.hive.ql.io" +
-      ".orc.DoubleStatistics\022L\n\020stringStatistic" +
-      "s\030\004 \001(\01322.org.apache.hadoop.hive.ql.io.o" +
-      "rc.StringStatistics\022L\n\020bucketStatistics\030",
-      "\005 \001(\01322.org.apache.hadoop.hive.ql.io.orc" +
-      ".BucketStatistics\022N\n\021decimalStatistics\030\006" +
-      " \001(\01323.org.apache.hadoop.hive.ql.io.orc." +
-      "DecimalStatistics\022H\n\016dateStatistics\030\007 \001(" +
-      "\01320.org.apache.hadoop.hive.ql.io.orc.Dat" +
-      "eStatistics\022L\n\020binaryStatistics\030\010 \001(\01322." +
-      "org.apache.hadoop.hive.ql.io.orc.BinaryS" +
-      "tatistics\022R\n\023timestampStatistics\030\t \001(\01325" +
-      ".org.apache.hadoop.hive.ql.io.orc.Timest" +
-      "ampStatistics\022\017\n\007hasNull\030\n \001(\010\"n\n\rRowInd",
-      "exEntry\022\025\n\tpositions\030\001 \003(\004B\002\020\001\022F\n\nstatis" +
-      "tics\030\002 \001(\01322.org.apache.hadoop.hive.ql.i" +
-      "o.orc.ColumnStatistics\"J\n\010RowIndex\022>\n\005en" +
-      "try\030\001 \003(\0132/.org.apache.hadoop.hive.ql.io" +
-      ".orc.RowIndexEntry\"7\n\013BloomFilter\022\030\n\020num" +
-      "HashFunctions\030\001 \001(\r\022\016\n\006bitset\030\002 \003(\006\"V\n\020B" +
-      "loomFilterIndex\022B\n\013bloomFilter\030\001 \003(\0132-.o" +
-      "rg.apache.hadoop.hive.ql.io.orc.BloomFil" +
-      "ter\"\354\001\n\006Stream\022;\n\004kind\030\001 \002(\0162-.org.apach" +
-      "e.hadoop.hive.ql.io.orc.Stream.Kind\022\016\n\006c",
-      "olumn\030\002 \001(\r\022\016\n\006length\030\003 \001(\004\"\204\001\n\004Kind\022\013\n\007" +
-      "PRESENT\020\000\022\010\n\004DATA\020\001\022\n\n\006LENGTH\020\002\022\023\n\017DICTI" +
-      "ONARY_DATA\020\003\022\024\n\020DICTIONARY_COUNT\020\004\022\r\n\tSE" +
-      "CONDARY\020\005\022\r\n\tROW_INDEX\020\006\022\020\n\014BLOOM_FILTER" +
-      "\020\007\"\263\001\n\016ColumnEncoding\022C\n\004kind\030\001 \002(\01625.or" +
-      "g.apache.hadoop.hive.ql.io.orc.ColumnEnc" +
-      "oding.Kind\022\026\n\016dictionarySize\030\002 \001(\r\"D\n\004Ki" +
-      "nd\022\n\n\006DIRECT\020\000\022\016\n\nDICTIONARY\020\001\022\r\n\tDIRECT" +
-      "_V2\020\002\022\021\n\rDICTIONARY_V2\020\003\"\214\001\n\014StripeFoote" +
-      "r\0229\n\007streams\030\001 \003(\0132(.org.apache.hadoop.h",
-      "ive.ql.io.orc.Stream\022A\n\007columns\030\002 \003(\01320." +
-      "org.apache.hadoop.hive.ql.io.orc.ColumnE" +
-      "ncoding\"\370\002\n\004Type\0229\n\004kind\030\001 \002(\0162+.org.apa" +
-      "che.hadoop.hive.ql.io.orc.Type.Kind\022\024\n\010s" +
-      "ubtypes\030\002 \003(\rB\002\020\001\022\022\n\nfieldNames\030\003 \003(\t\022\025\n" +
-      "\rmaximumLength\030\004 \001(\r\022\021\n\tprecision\030\005 \001(\r\022" +
-      "\r\n\005scale\030\006 \001(\r\"\321\001\n\004Kind\022\013\n\007BOOLEAN\020\000\022\010\n\004" +
-      "BYTE\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010\n\004LONG\020\004\022\t\n\005" +
-      "FLOAT\020\005\022\n\n\006DOUBLE\020\006\022\n\n\006STRING\020\007\022\n\n\006BINAR" +
-      "Y\020\010\022\r\n\tTIMESTAMP\020\t\022\010\n\004LIST\020\n\022\007\n\003MAP\020\013\022\n\n",
-      "\006STRUCT\020\014\022\t\n\005UNION\020\r\022\013\n\007DECIMAL\020\016\022\010\n\004DAT" +
-      "E\020\017\022\013\n\007VARCHAR\020\020\022\010\n\004CHAR\020\021\"x\n\021StripeInfo" +
-      "rmation\022\016\n\006offset\030\001 \001(\004\022\023\n\013indexLength\030\002" +
-      " \001(\004\022\022\n\ndataLength\030\003 \001(\004\022\024\n\014footerLength" +
-      "\030\004 \001(\004\022\024\n\014numberOfRows\030\005 \001(\004\"/\n\020UserMeta" +
-      "dataItem\022\014\n\004name\030\001 \002(\t\022\r\n\005value\030\002 \002(\014\"X\n" +
-      "\020StripeStatistics\022D\n\010colStats\030\001 \003(\01322.or" +
-      "g.apache.hadoop.hive.ql.io.orc.ColumnSta" +
-      "tistics\"S\n\010Metadata\022G\n\013stripeStats\030\001 \003(\013" +
-      "22.org.apache.hadoop.hive.ql.io.orc.Stri",
-      "peStatistics\"\356\002\n\006Footer\022\024\n\014headerLength\030" +
-      "\001 \001(\004\022\025\n\rcontentLength\030\002 \001(\004\022D\n\007stripes\030" +
-      "\003 \003(\01323.org.apache.hadoop.hive.ql.io.orc" +
-      ".StripeInformation\0225\n\005types\030\004 \003(\0132&.org." +
-      "apache.hadoop.hive.ql.io.orc.Type\022D\n\010met" +
-      "adata\030\005 \003(\01322.org.apache.hadoop.hive.ql." +
-      "io.orc.UserMetadataItem\022\024\n\014numberOfRows\030" +
-      "\006 \001(\004\022F\n\nstatistics\030\007 \003(\01322.org.apache.h" +
-      "adoop.hive.ql.io.orc.ColumnStatistics\022\026\n" +
-      "\016rowIndexStride\030\010 \001(\r\"\334\001\n\nPostScript\022\024\n\014",
-      "footerLength\030\001 \001(\004\022F\n\013compression\030\002 \001(\0162" +
-      "1.org.apache.hadoop.hive.ql.io.orc.Compr" +
-      "essionKind\022\034\n\024compressionBlockSize\030\003 \001(\004" +
-      "\022\023\n\007version\030\004 \003(\rB\002\020\001\022\026\n\016metadataLength\030" +
-      "\005 \001(\004\022\025\n\rwriterVersion\030\006 \001(\r\022\016\n\005magic\030\300>" +
-      " \001(\t*:\n\017CompressionKind\022\010\n\004NONE\020\000\022\010\n\004ZLI" +
-      "B\020\001\022\n\n\006SNAPPY\020\002\022\007\n\003LZO\020\003"
+      "\n\017orc_proto.proto\022\torc.proto\"B\n\021IntegerS" +
+      "tatistics\022\017\n\007minimum\030\001 \001(\022\022\017\n\007maximum\030\002 " +
+      "\001(\022\022\013\n\003sum\030\003 \001(\022\"A\n\020DoubleStatistics\022\017\n\007" +
+      "minimum\030\001 \001(\001\022\017\n\007maximum\030\002 \001(\001\022\013\n\003sum\030\003 " +
+      "\001(\001\"A\n\020StringStatistics\022\017\n\007minimum\030\001 \001(\t" +
+      "\022\017\n\007maximum\030\002 \001(\t\022\013\n\003sum\030\003 \001(\022\"%\n\020Bucket" +
+      "Statistics\022\021\n\005count\030\001 \003(\004B\002\020\001\"B\n\021Decimal" +
+      "Statistics\022\017\n\007minimum\030\001 \001(\t\022\017\n\007maximum\030\002" +
+      " \001(\t\022\013\n\003sum\030\003 \001(\t\"2\n\016DateStatistics\022\017\n\007m" +
+      "inimum\030\001 \001(\021\022\017\n\007maximum\030\002 \001(\021\"7\n\023Timesta",
+      "mpStatistics\022\017\n\007minimum\030\001 \001(\022\022\017\n\007maximum" +
+      "\030\002 \001(\022\"\037\n\020BinaryStatistics\022\013\n\003sum\030\001 \001(\022\"" +
+      "\365\003\n\020ColumnStatistics\022\026\n\016numberOfValues\030\001" +
+      " \001(\004\0223\n\rintStatistics\030\002 \001(\0132\034.orc.proto." +
+      "IntegerStatistics\0225\n\020doubleStatistics\030\003 " +
+      "\001(\0132\033.orc.proto.DoubleStatistics\0225\n\020stri" +
+      "ngStatistics\030\004 \001(\0132\033.orc.proto.StringSta" +
+      "tistics\0225\n\020bucketStatistics\030\005 \001(\0132\033.orc." +
+      "proto.BucketStatistics\0227\n\021decimalStatist" +
+      "ics\030\006 \001(\0132\034.orc.proto.DecimalStatistics\022",
+      "1\n\016dateStatistics\030\007 \001(\0132\031.orc.proto.Date" +
+      "Statistics\0225\n\020binaryStatistics\030\010 \001(\0132\033.o" +
+      "rc.proto.BinaryStatistics\022;\n\023timestampSt" +
+      "atistics\030\t \001(\0132\036.orc.proto.TimestampStat" +
+      "istics\022\017\n\007hasNull\030\n \001(\010\"W\n\rRowIndexEntry" +
+      "\022\025\n\tpositions\030\001 \003(\004B\002\020\001\022/\n\nstatistics\030\002 " +
+      "\001(\0132\033.orc.proto.ColumnStatistics\"3\n\010RowI" +
+      "ndex\022\'\n\005entry\030\001 \003(\0132\030.orc.proto.RowIndex" +
+      "Entry\"7\n\013BloomFilter\022\030\n\020numHashFunctions" +
+      "\030\001 \001(\r\022\016\n\006bitset\030\002 \003(\006\"?\n\020BloomFilterInd",
+      "ex\022+\n\013bloomFilter\030\001 \003(\0132\026.orc.proto.Bloo" +
+      "mFilter\"\325\001\n\006Stream\022$\n\004kind\030\001 \001(\0162\026.orc.p" +
+      "roto.Stream.Kind\022\016\n\006column\030\002 \001(\r\022\016\n\006leng" +
+      "th\030\003 \001(\004\"\204\001\n\004Kind\022\013\n\007PRESENT\020\000\022\010\n\004DATA\020\001" +
+      "\022\n\n\006LENGTH\020\002\022\023\n\017DICTIONARY_DATA\020\003\022\024\n\020DIC" +
+      "TIONARY_COUNT\020\004\022\r\n\tSECONDARY\020\005\022\r\n\tROW_IN" +
+      "DEX\020\006\022\020\n\014BLOOM_FILTER\020\007\"\234\001\n\016ColumnEncodi" +
+      "ng\022,\n\004kind\030\001 \001(\0162\036.orc.proto.ColumnEncod" +
+      "ing.Kind\022\026\n\016dictionarySize\030\002 \001(\r\"D\n\004Kind" +
+      "\022\n\n\006DIRECT\020\000\022\016\n\nDICTIONARY\020\001\022\r\n\tDIRECT_V",
+      "2\020\002\022\021\n\rDICTIONARY_V2\020\003\"^\n\014StripeFooter\022\"" +
+      "\n\007streams\030\001 \003(\0132\021.orc.proto.Stream\022*\n\007co" +
+      "lumns\030\002 \003(\0132\031.orc.proto.ColumnEncoding\"\341" +
+      "\002\n\004Type\022\"\n\004kind\030\001 \001(\0162\024.orc.proto.Type.K" +
+      "ind\022\024\n\010subtypes\030\002 \003(\rB\002\020\001\022\022\n\nfieldNames\030" +
+      "\003 \003(\t\022\025\n\rmaximumLength\030\004 \001(\r\022\021\n\tprecisio" +
+      "n\030\005 \001(\r\022\r\n\005scale\030\006 \001(\r\"\321\001\n\004Kind\022\013\n\007BOOLE" +
+      "AN\020\000\022\010\n\004BYTE\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010\n\004LO" +
+      "NG\020\004\022\t\n\005FLOAT\020\005\022\n\n\006DOUBLE\020\006\022\n\n\006STRING\020\007\022" +
+      "\n\n\006BINARY\020\010\022\r\n\tTIMESTAMP\020\t\022\010\n\004LIST\020\n\022\007\n\003",
+      "MAP\020\013\022\n\n\006STRUCT\020\014\022\t\n\005UNION\020\r\022\013\n\007DECIMAL\020" +
+      "\016\022\010\n\004DATE\020\017\022\013\n\007VARCHAR\020\020\022\010\n\004CHAR\020\021\"x\n\021St" +
+      "ripeInformation\022\016\n\006offset\030\001 \001(\004\022\023\n\013index" +
+      "Length\030\002 \001(\004\022\022\n\ndataLength\030\003 \001(\004\022\024\n\014foot" +
+      "erLength\030\004 \001(\004\022\024\n\014numberOfRows\030\005 \001(\004\"/\n\020" +
+      "UserMetadataItem\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030" +
+      "\002 \001(\014\"A\n\020StripeStatistics\022-\n\010colStats\030\001 " +
+      "\003(\0132\033.orc.proto.ColumnStatistics\"<\n\010Meta" +
+      "data\0220\n\013stripeStats\030\001 \003(\0132\033.orc.proto.St" +
+      "ripeStatistics\"\222\002\n\006Footer\022\024\n\014headerLengt",
+      "h\030\001 \001(\004\022\025\n\rcontentLength\030\002 \001(\004\022-\n\007stripe" +
+      "s\030\003 \003(\0132\034.orc.proto.StripeInformation\022\036\n" +
+      "\005types\030\004 \003(\0132\017.orc.proto.Type\022-\n\010metadat" +
+      "a\030\005 \003(\0132\033.orc.proto.UserMetadataItem\022\024\n\014" +
+      "numberOfRows\030\006 \001(\004\022/\n\nstatistics\030\007 \003(\0132\033" +
+      ".orc.proto.ColumnStatistics\022\026\n\016rowIndexS" +
+      "tride\030\010 \001(\r\"\305\001\n\nPostScript\022\024\n\014footerLeng" +
+      "th\030\001 \001(\004\022/\n\013compression\030\002 \001(\0162\032.orc.prot" +
+      "o.CompressionKind\022\034\n\024compressionBlockSiz" +
+      "e\030\003 \001(\004\022\023\n\007version\030\004 \003(\rB\002\020\001\022\026\n\016metadata",
+      "Length\030\005 \001(\004\022\025\n\rwriterVersion\030\006 \001(\r\022\016\n\005m" +
+      "agic\030\300> \001(\t*:\n\017CompressionKind\022\010\n\004NONE\020\000" +
+      "\022\010\n\004ZLIB\020\001\022\n\n\006SNAPPY\020\002\022\007\n\003LZO\020\003B\"\n org.a" +
+      "pache.hadoop.hive.ql.io.orc"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_descriptor =
+          internal_static_orc_proto_IntegerStatistics_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_IntegerStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_IntegerStatistics_descriptor,
+              internal_static_orc_proto_IntegerStatistics_descriptor,
               new java.lang.String[] { "Minimum", "Maximum", "Sum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_descriptor =
+          internal_static_orc_proto_DoubleStatistics_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_DoubleStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_DoubleStatistics_descriptor,
+              internal_static_orc_proto_DoubleStatistics_descriptor,
               new java.lang.String[] { "Minimum", "Maximum", "Sum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_descriptor =
+          internal_static_orc_proto_StringStatistics_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_StringStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_StringStatistics_descriptor,
+              internal_static_orc_proto_StringStatistics_descriptor,
               new java.lang.String[] { "Minimum", "Maximum", "Sum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_descriptor =
+          internal_static_orc_proto_BucketStatistics_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_BucketStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_BucketStatistics_descriptor,
+              internal_static_orc_proto_BucketStatistics_descriptor,
               new java.lang.String[] { "Count", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_descriptor =
+          internal_static_orc_proto_DecimalStatistics_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_DecimalStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_DecimalStatistics_descriptor,
+              internal_static_orc_proto_DecimalStatistics_descriptor,
               new java.lang.String[] { "Minimum", "Maximum", "Sum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_descriptor =
+          internal_static_orc_proto_DateStatistics_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_DateStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_DateStatistics_descriptor,
+              internal_static_orc_proto_DateStatistics_descriptor,
               new java.lang.String[] { "Minimum", "Maximum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_descriptor =
+          internal_static_orc_proto_TimestampStatistics_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_TimestampStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_TimestampStatistics_descriptor,
+              internal_static_orc_proto_TimestampStatistics_descriptor,
               new java.lang.String[] { "Minimum", "Maximum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_descriptor =
+          internal_static_orc_proto_BinaryStatistics_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_BinaryStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_BinaryStatistics_descriptor,
+              internal_static_orc_proto_BinaryStatistics_descriptor,
               new java.lang.String[] { "Sum", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_descriptor =
+          internal_static_orc_proto_ColumnStatistics_descriptor =
             getDescriptor().getMessageTypes().get(8);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_ColumnStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnStatistics_descriptor,
+              internal_static_orc_proto_ColumnStatistics_descriptor,
               new java.lang.String[] { "NumberOfValues", "IntStatistics", "DoubleStatistics", "StringStatistics", "BucketStatistics", "DecimalStatistics", "DateStatistics", "BinaryStatistics", "TimestampStatistics", "HasNull", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_descriptor =
+          internal_static_orc_proto_RowIndexEntry_descriptor =
             getDescriptor().getMessageTypes().get(9);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_fieldAccessorTable = new
+          internal_static_orc_proto_RowIndexEntry_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndexEntry_descriptor,
+              internal_static_orc_proto_RowIndexEntry_descriptor,
               new java.lang.String[] { "Positions", "Statistics", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_descriptor =
+          internal_static_orc_proto_RowIndex_descriptor =
             getDescriptor().getMessageTypes().get(10);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_fieldAccessorTable = new
+          internal_static_orc_proto_RowIndex_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_RowIndex_descriptor,
+              internal_static_orc_proto_RowIndex_descriptor,
               new java.lang.String[] { "Entry", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_descriptor =
+          internal_static_orc_proto_BloomFilter_descriptor =
             getDescriptor().getMessageTypes().get(11);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_fieldAccessorTable = new
+          internal_static_orc_proto_BloomFilter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilter_descriptor,
+              internal_static_orc_proto_BloomFilter_descriptor,
               new java.lang.String[] { "NumHashFunctions", "Bitset", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_descriptor =
+          internal_static_orc_proto_BloomFilterIndex_descriptor =
             getDescriptor().getMessageTypes().get(12);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_fieldAccessorTable = new
+          internal_static_orc_proto_BloomFilterIndex_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_BloomFilterIndex_descriptor,
+              internal_static_orc_proto_BloomFilterIndex_descriptor,
               new java.lang.String[] { "BloomFilter", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_descriptor =
+          internal_static_orc_proto_Stream_descriptor =
             getDescriptor().getMessageTypes().get(13);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_fieldAccessorTable = new
+          internal_static_orc_proto_Stream_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_Stream_descriptor,
+              internal_static_orc_proto_Stream_descriptor,
               new java.lang.String[] { "Kind", "Column", "Length", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_descriptor =
+          internal_static_orc_proto_ColumnEncoding_descriptor =
             getDescriptor().getMessageTypes().get(14);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_fieldAccessorTable = new
+          internal_static_orc_proto_ColumnEncoding_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_ColumnEncoding_descriptor,
+              internal_static_orc_proto_ColumnEncoding_descriptor,
               new java.lang.String[] { "Kind", "DictionarySize", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_descriptor =
+          internal_static_orc_proto_StripeFooter_descriptor =
             getDescriptor().getMessageTypes().get(15);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_fieldAccessorTable = new
+          internal_static_orc_proto_StripeFooter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_StripeFooter_descriptor,
+              internal_static_orc_proto_StripeFooter_descriptor,
               new java.lang.String[] { "Streams", "Columns", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Type_descriptor =
+          internal_static_orc_proto_Type_descriptor =
             getDescriptor().getMessageTypes().get(16);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Type_fieldAccessorTable = new
+          internal_static_orc_proto_Type_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_Type_descriptor,
+              internal_static_orc_proto_Type_descriptor,
               new java.lang.String[] { "Kind", "Subtypes", "FieldNames", "MaximumLength", "Precision", "Scale", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_descriptor =
+          internal_static_orc_proto_StripeInformation_descriptor =
             getDescriptor().getMessageTypes().get(17);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_fieldAccessorTable = new
+          internal_static_orc_proto_StripeInformation_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_StripeInformation_descriptor,
+              internal_static_orc_proto_StripeInformation_descriptor,
               new java.lang.String[] { "Offset", "IndexLength", "DataLength", "FooterLength", "NumberOfRows", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_descriptor =
+          internal_static_orc_proto_UserMetadataItem_descriptor =
             getDescriptor().getMessageTypes().get(18);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_fieldAccessorTable = new
+          internal_static_orc_proto_UserMetadataItem_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_UserMetadataItem_descriptor,
+              internal_static_orc_proto_UserMetadataItem_descriptor,
               new java.lang.String[] { "Name", "Value", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_descriptor =
+          internal_static_orc_proto_StripeStatistics_descriptor =
             getDescriptor().getMessageTypes().get(19);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_fieldAccessorTable = new
+          internal_static_orc_proto_StripeStatistics_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_StripeStatistics_descriptor,
+              internal_static_orc_proto_StripeStatistics_descriptor,
               new java.lang.String[] { "ColStats", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_descriptor =
+          internal_static_orc_proto_Metadata_descriptor =
             getDescriptor().getMessageTypes().get(20);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_fieldAccessorTable = new
+          internal_static_orc_proto_Metadata_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_Metadata_descriptor,
+              internal_static_orc_proto_Metadata_descriptor,
               new java.lang.String[] { "StripeStats", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_descriptor =
+          internal_static_orc_proto_Footer_descriptor =
             getDescriptor().getMessageTypes().get(21);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_fieldAccessorTable = new
+          internal_static_orc_proto_Footer_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_Footer_descriptor,
+              internal_static_orc_proto_Footer_descriptor,
               new java.lang.String[] { "HeaderLength", "ContentLength", "Stripes", "Types", "Metadata", "NumberOfRows", "Statistics", "RowIndexStride", });
-          internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_descriptor =
+          internal_static_orc_proto_PostScript_descriptor =
             getDescriptor().getMessageTypes().get(22);
-          internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_fieldAccessorTable = new
+          internal_static_orc_proto_PostScript_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_apache_hadoop_hive_ql_io_orc_PostScript_descriptor,
+              internal_static_orc_proto_PostScript_descriptor,
               new java.lang.String[] { "FooterLength", "Compression", "CompressionBlockSize", "Version", "MetadataLength", "WriterVersion", "Magic", });
           return null;
         }
